Skip to content

Commit 71312bc

Browse files
committed
Fix compilation checks in test scripts
Correct the logic for checking if the client and server examples are compiled in the test scripts. The previous logic was inverted, causing the tests to always skip if the examples *were* compiled.
1 parent ca5b484 commit 71312bc

7 files changed

Lines changed: 22 additions & 22 deletions

scripts/crl-revoked.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[ ! -x ./examples/client/client ] && printf '\n\n%s\n' "Client doesn't exist" \
44
&& exit 1
55

6-
if ! ./examples/client/client | grep "Client not compiled in!" ; then
6+
if ./examples/client/client -? | grep "Client not compiled in!" ; then
77
echo 'skipping crl-revoked.test because client not compiled in.' 1>&2
88
exit 77
99
fi

scripts/dtlscid.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
[ ! -x ./examples/server/server ] && printf '\n\n%s\n' "Server doesn't exist" \
1010
&& exit 0
1111

12-
if ! ./examples/client/client | grep "Client not compiled in!" ; then
13-
echo 'skipping crl-revoked.test because client not compiled in.' 1>&2
12+
if ./examples/client/client -? | grep "Client not compiled in!" ; then
13+
echo 'skipping dtlscid.test because client not compiled in.' 1>&2
1414
exit 77
1515
fi
1616

17-
if ! ./examples/server/server | grep "Server not compiled in!" ; then
18-
echo 'skipping crl-revoked.test because server not compiled in.' 1>&2
17+
if ./examples/server/server -? | grep "Server not compiled in!" ; then
18+
echo 'skipping dtlscid.test because server not compiled in.' 1>&2
1919
exit 77
2020
fi
2121

scripts/ocsp-stapling-with-ca-as-responder.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ fi
2929
[ ! -x ./examples/server/server ] && printf '\n\n%s\n' "Server doesn't exist" \
3030
&& exit 1
3131

32-
if ! ./examples/client/client | grep "Client not compiled in!" ; then
33-
echo 'skipping crl-revoked.test because client not compiled in.' 1>&2
32+
if ./examples/client/client -? | grep "Client not compiled in!" ; then
33+
echo 'skipping ocsp-stapling-with-ca-as-responder.test because client not compiled in.' 1>&2
3434
exit 77
3535
fi
3636

37-
if ! ./examples/server/server | grep "Server not compiled in!" ; then
38-
echo 'skipping crl-revoked.test because server not compiled in.' 1>&2
37+
if ./examples/server/server -? | grep "Server not compiled in!" ; then
38+
echo 'skipping ocsp-stapling-with-ca-as-responder.test because server not compiled in.' 1>&2
3939
exit 77
4040
fi
4141

scripts/ocsp-stapling.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ fi
2323
[ ! -x ./examples/server/server ] && printf '\n\n%s\n' "Server doesn't exist" \
2424
&& exit 1
2525

26-
if ! ./examples/client/client | grep "Client not compiled in!" ; then
27-
echo 'skipping crl-revoked.test because client not compiled in.' 1>&2
26+
if ./examples/client/client -? | grep "Client not compiled in!" ; then
27+
echo 'skipping ocsp-stapling.test because client not compiled in.' 1>&2
2828
exit 77
2929
fi
3030

31-
if ! ./examples/server/server | grep "Server not compiled in!" ; then
32-
echo 'skipping crl-revoked.test because server not compiled in.' 1>&2
31+
if ./examples/server/server -? | grep "Server not compiled in!" ; then
32+
echo 'skipping ocsp-stapling.test because server not compiled in.' 1>&2
3333
exit 77
3434
fi
3535

scripts/ocsp-stapling2.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ fi
3030
[ ! -x ./examples/server/server ] && printf '\n\n%s\n' "Server doesn't exist" \
3131
&& exit 1
3232

33-
if ! ./examples/client/client | grep "Client not compiled in!" ; then
34-
echo 'skipping crl-revoked.test because client not compiled in.' 1>&2
33+
if ./examples/client/client -? | grep "Client not compiled in!" ; then
34+
echo 'skipping ocsp-stapling2.test because client not compiled in.' 1>&2
3535
exit 77
3636
fi
3737

38-
if ! ./examples/server/server | grep "Server not compiled in!" ; then
39-
echo 'skipping crl-revoked.test because server not compiled in.' 1>&2
38+
if ./examples/server/server -? | grep "Server not compiled in!" ; then
39+
echo 'skipping ocsp-stapling2.test because server not compiled in.' 1>&2
4040
exit 77
4141
fi
4242

scripts/ocsp-stapling_tls13multi.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ fi
3030
[ ! -x ./examples/server/server ] && printf '\n\n%s\n' "Server doesn't exist" \
3131
&& exit 1
3232

33-
if ! ./examples/client/client | grep "Client not compiled in!" ; then
34-
echo 'skipping crl-revoked.test because client not compiled in.' 1>&2
33+
if ./examples/client/client -? | grep "Client not compiled in!" ; then
34+
echo 'skipping ocsp-stapling_tls13multi.test because client not compiled in.' 1>&2
3535
exit 77
3636
fi
3737

38-
if ! ./examples/server/server | grep "Server not compiled in!" ; then
39-
echo 'skipping crl-revoked.test because server not compiled in.' 1>&2
38+
if ./examples/server/server -? | grep "Server not compiled in!" ; then
39+
echo 'skipping ocsp-stapling_tls13multi.test because server not compiled in.' 1>&2
4040
exit 77
4141
fi
4242

scripts/pkcallbacks.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[ ! -x ./examples/client/client ] && printf '\n\n%s\n' "Client doesn't exist" \
66
&& exit 1
77

8-
if ! ./examples/client/client | grep "Client not compiled in!" ; then
8+
if ./examples/client/client -? | grep "Client not compiled in!" ; then
99
echo 'skipping pkcallbacks.test because client not compiled in.' 1>&2
1010
exit 77
1111
fi

0 commit comments

Comments
 (0)