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.

Author: julek-wolfssl

scripts/benchmark.test

@@ -2,6 +2,19 @@
 
 #benchmark.test
 
+[ ! -x ./examples/client/client ] && printf '\n\n%s\n' "Client doesn't exist" \
+                                  && exit 1
+
+if ./examples/client/client -? 2>&1 | grep "Client not compiled in!" ; then
+    echo 'skipping benchmark.test because client not compiled in.' 1>&2
+    exit 77
+fi
+
+if ./examples/server/server -? 2>&1 | grep "Server not compiled in!" ; then
+    echo 'skipping benchmark.test because server not compiled in.' 1>&2
+    exit 77
+fi
+
 if [ "$#" -lt 2 ]; then
     echo "Usage: $0 [mode] [num] [clientargs] [serverargs]" >&2
     echo "    [mode]: 1=Connection Rate (TPS), 2=Throughput Bytes" >&2

scripts/crl-revoked.test

@@ -3,11 +3,16 @@
 [ ! -x ./examples/client/client ] && printf '\n\n%s\n' "Client doesn't exist" \
                                   && exit 1
 
-if ! ./examples/client/client | grep "Client not compiled in!" ; then
+if ./examples/client/client -? 2>&1 | grep "Client not compiled in!" ; then
     echo 'skipping crl-revoked.test because client not compiled in.' 1>&2
     exit 77
 fi
 
+if ./examples/server/server -? 2>&1 | grep "Server not compiled in!" ; then
+    echo 'skipping crl-revoked.test because server not compiled in.' 1>&2
+    exit 77
+fi
+
 #crl.test
 # if we can, isolate the network namespace to eliminate port collisions.
 if [[ -n "$NETWORK_UNSHARE_HELPER" ]]; then

scripts/dtls.test

@@ -16,6 +16,19 @@ DO_DELAY_TEST=${DO_DELAY_TEST:-0}
 
 #set -x # enable debug output
 
+[ ! -x ./examples/client/client ] && printf '\n\n%s\n' "Client doesn't exist" \
+                                  && exit 1
+
+if ./examples/client/client -? 2>&1 | grep "Client not compiled in!" ; then
+    echo 'skipping dtls.test because client not compiled in.' 1>&2
+    exit 77
+fi
+
+if ./examples/server/server -? 2>&1 | grep "Server not compiled in!" ; then
+    echo 'skipping dtls.test because server not compiled in.' 1>&2
+    exit 77
+fi
+
 # bwrap execution environment to avoid port conflicts
 if [ "${AM_BWRAPPED-}" != "yes" ]; then
     bwrap_path="$(command -v bwrap)"

scripts/dtlscid.test

@@ -9,13 +9,13 @@
 [ ! -x ./examples/server/server ] && printf '\n\n%s\n' "Server doesn't exist" \
                                   && exit 0
 
-if ! ./examples/client/client | grep "Client not compiled in!" ; then
-    echo 'skipping crl-revoked.test because client not compiled in.' 1>&2
+if ./examples/client/client -? 2>&1 | grep "Client not compiled in!" ; then
+    echo 'skipping dtlscid.test because client not compiled in.' 1>&2
     exit 77
 fi
 
-if ! ./examples/server/server | grep "Server not compiled in!" ; then
-    echo 'skipping crl-revoked.test because server not compiled in.' 1>&2
+if ./examples/server/server -? 2>&1 | grep "Server not compiled in!" ; then
+    echo 'skipping dtlscid.test because server not compiled in.' 1>&2
     exit 77
 fi
 

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

@@ -29,13 +29,13 @@ fi
 [ ! -x ./examples/server/server ] && printf '\n\n%s\n' "Server doesn't exist" \
                                   && exit 1
 
-if ! ./examples/client/client | grep "Client not compiled in!" ; then
-    echo 'skipping crl-revoked.test because client not compiled in.' 1>&2
+if ./examples/client/client -? 2>&1 | grep "Client not compiled in!" ; then
+    echo 'skipping ocsp-stapling-with-ca-as-responder.test because client not compiled in.' 1>&2
     exit 77
 fi
 
-if ! ./examples/server/server | grep "Server not compiled in!" ; then
-    echo 'skipping crl-revoked.test because server not compiled in.' 1>&2
+if ./examples/server/server -? 2>&1 | grep "Server not compiled in!" ; then
+    echo 'skipping ocsp-stapling-with-ca-as-responder.test because server not compiled in.' 1>&2
     exit 77
 fi
 

scripts/ocsp-stapling.test

@@ -23,13 +23,13 @@ fi
 [ ! -x ./examples/server/server ] && printf '\n\n%s\n' "Server doesn't exist" \
                                   && exit 1
 
-if ! ./examples/client/client | grep "Client not compiled in!" ; then
-    echo 'skipping crl-revoked.test because client not compiled in.' 1>&2
+if ./examples/client/client -? 2>&1 | grep "Client not compiled in!" ; then
+    echo 'skipping ocsp-stapling.test because client not compiled in.' 1>&2
     exit 77
 fi
 
-if ! ./examples/server/server | grep "Server not compiled in!" ; then
-    echo 'skipping crl-revoked.test because server not compiled in.' 1>&2
+if ./examples/server/server -? 2>&1 | grep "Server not compiled in!" ; then
+    echo 'skipping ocsp-stapling.test because server not compiled in.' 1>&2
     exit 77
 fi
 

scripts/ocsp-stapling2.test

@@ -30,13 +30,13 @@ fi
 [ ! -x ./examples/server/server ] && printf '\n\n%s\n' "Server doesn't exist" \
                                   && exit 1
 
-if ! ./examples/client/client | grep "Client not compiled in!" ; then
-    echo 'skipping crl-revoked.test because client not compiled in.' 1>&2
+if ./examples/client/client -? 2>&1 | grep "Client not compiled in!" ; then
+    echo 'skipping ocsp-stapling2.test because client not compiled in.' 1>&2
     exit 77
 fi
 
-if ! ./examples/server/server | grep "Server not compiled in!" ; then
-    echo 'skipping crl-revoked.test because server not compiled in.' 1>&2
+if ./examples/server/server -? 2>&1 | grep "Server not compiled in!" ; then
+    echo 'skipping ocsp-stapling2.test because server not compiled in.' 1>&2
     exit 77
 fi
 

scripts/ocsp-stapling_tls13multi.test

@@ -30,13 +30,13 @@ fi
 [ ! -x ./examples/server/server ] && printf '\n\n%s\n' "Server doesn't exist" \
                                   && exit 1
 
-if ! ./examples/client/client | grep "Client not compiled in!" ; then
-    echo 'skipping crl-revoked.test because client not compiled in.' 1>&2
+if ./examples/client/client -? 2>&1 | grep "Client not compiled in!" ; then
+    echo 'skipping ocsp-stapling_tls13multi.test because client not compiled in.' 1>&2
     exit 77
 fi
 
-if ! ./examples/server/server | grep "Server not compiled in!" ; then
-    echo 'skipping crl-revoked.test because server not compiled in.' 1>&2
+if ./examples/server/server -? 2>&1 | grep "Server not compiled in!" ; then
+    echo 'skipping ocsp-stapling_tls13multi.test because server not compiled in.' 1>&2
     exit 77
 fi
 

scripts/pkcallbacks.test

@@ -5,11 +5,16 @@
 [ ! -x ./examples/client/client ] && printf '\n\n%s\n' "Client doesn't exist" \
                                   && exit 1
 
-if ! ./examples/client/client | grep "Client not compiled in!" ; then
+if ./examples/client/client -? 2>&1 | grep "Client not compiled in!" ; then
     echo 'skipping pkcallbacks.test because client not compiled in.' 1>&2
     exit 77
 fi
 
+if ./examples/server/server -? 2>&1 | grep "Server not compiled in!" ; then
+    echo 'skipping pkcallbacks.test because server not compiled in.' 1>&2
+    exit 77
+fi
+
 # if we can, isolate the network namespace to eliminate port collisions.
 if [[ -n "$NETWORK_UNSHARE_HELPER" ]]; then
      if [[ -z "$NETWORK_UNSHARE_HELPER_CALLED" ]]; then

scripts/rsapss.test

@@ -2,6 +2,19 @@
 
 # rsapss.test
 
+[ ! -x ./examples/client/client ] && printf '\n\n%s\n' "Client doesn't exist" \
+                                  && exit 1
+
+if ./examples/client/client -? 2>&1 | grep "Client not compiled in!" ; then
+    echo 'skipping rsapss.test because client not compiled in.' 1>&2
+    exit 77
+fi
+
+if ./examples/server/server -? 2>&1 | grep "Server not compiled in!" ; then
+    echo 'skipping rsapss.test because server not compiled in.' 1>&2
+    exit 77
+fi
+
 if ! ./examples/client/client -V | grep -q 4; then
     echo "skipping because TLS 1.3 not enabled in this build"
     exit 0