Meta/Make: simplify skipping
Junio C Hamano committed
Jun 11, 2024 at 17:17 UTC
7021daf115248bbeed65b2718311b23a6b7daa73
1 file changed
+4
-25
Make
+4
-25
@@ -55,28 +55,9 @@ do
55
)
56
done
57
58
-tests= jobs= skip= oldtest= with_dash= testpen=
58
+tests= jobs= oldtest= with_dash= testpen=
59
clean=:
60
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
-
61
determine_branch () {
62
expr "$($GIT symbolic-ref --no-recurse HEAD 2>/dev/null ||
63
$GIT symbolic-ref HEAD 2>/dev/null)" : 'refs/heads/\(.*\)' ||
@@ -197,11 +178,6 @@ fi
178
179
test -f /bin/dash || with_dash=
180
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
181
if test -z "$oldtest" &&
182
sh -c 'prove --version >/dev/null 2>&1' &&
183
sh -c 'prove --exec : >/dev/null 2>&1'
@@ -274,6 +250,9 @@ then
250
set INSTALL=ginstall "$@"
251
fi
252
253
+GIT_SKIP_TESTS=${GIT_SKIP_TESTS:+"$GIT_SKIP_TESTS "}"t95??"
254
+export GIT_SKIP_TESTS
255
+
256
unset SSH_AGENT_PID SSH_CLIENT SSH_TTY SSH_AUTH_SOCK SSH_CONNECTION \
257
GPG_AGENT_INFO GNOME_KEYRING_CONTROL GNOME_KEYRING_PID \
258
XDG_SESSION_COOKIE XDG_SESSION_PATH XDG_SEAT_PATH XDG_DATA_DIRS \