Skip to content

Commit 7021daf

Browse files
committed
Meta/Make: simplify skipping
1 parent c870c83 commit 7021daf

File tree

1 file changed

+4
-25
lines changed

1 file changed

+4
-25
lines changed

Make

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -55,28 +55,9 @@ do
5555
)
5656
done
5757

58-
tests= jobs= skip= oldtest= with_dash= testpen=
58+
tests= jobs= oldtest= with_dash= testpen=
5959
clean=:
6060

61-
case `uname` in
62-
OpenBSD)
63-
# O="-fgnu89-inline"
64-
skip="t9402"
65-
;;
66-
NetBSD)
67-
OLD_ICONV=YesPlease; export OLD_ICONV
68-
skip="t5000 t9402"
69-
;;
70-
FreeBSD)
71-
OLD_ICONV=YesPlease; export OLD_ICONV
72-
skip="t5560"
73-
;;
74-
SunOS)
75-
NEEDS_CRYPTO_WITH_SSL=YesPlease ; export NEEDS_CRYPTO_WITH_SSL
76-
NO_PEDANTIC=CannotDo
77-
;;
78-
esac
79-
8061
determine_branch () {
8162
expr "$($GIT symbolic-ref --no-recurse HEAD 2>/dev/null ||
8263
$GIT symbolic-ref HEAD 2>/dev/null)" : 'refs/heads/\(.*\)' ||
@@ -197,11 +178,6 @@ fi
197178

198179
test -f /bin/dash || with_dash=
199180

200-
if test -z "$tests" && test -n "$skip"
201-
then
202-
GIT_SKIP_TESTS="${GIT_SKIP_TESTS:-$skip}"
203-
export GIT_SKIP_TESTS
204-
fi
205181
if test -z "$oldtest" &&
206182
sh -c 'prove --version >/dev/null 2>&1' &&
207183
sh -c 'prove --exec : >/dev/null 2>&1'
@@ -274,6 +250,9 @@ then
274250
set INSTALL=ginstall "$@"
275251
fi
276252

253+
GIT_SKIP_TESTS=${GIT_SKIP_TESTS:+"$GIT_SKIP_TESTS "}"t95??"
254+
export GIT_SKIP_TESTS
255+
277256
unset SSH_AGENT_PID SSH_CLIENT SSH_TTY SSH_AUTH_SOCK SSH_CONNECTION \
278257
GPG_AGENT_INFO GNOME_KEYRING_CONTROL GNOME_KEYRING_PID \
279258
XDG_SESSION_COOKIE XDG_SESSION_PATH XDG_SEAT_PATH XDG_DATA_DIRS \

0 commit comments

Comments
 (0)