summaryrefslogtreecommitdiff
path: root/tests/suite
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2016-12-28 09:04:59 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2016-12-31 10:35:29 +0100
commitdd1841cfb09841eed2a82b73415a2fe918e1d4d7 (patch)
tree23c5550ea91847fcbacce4ddadc8b4b9daad1796 /tests/suite
parentd048462f33dda8d950f8b9078682530ce301e0b0 (diff)
downloadgnutls-dd1841cfb09841eed2a82b73415a2fe918e1d4d7.tar.gz
tests: better termination checking in compat tests
This ensures that the exit code of all spawned processes is checked.
Diffstat (limited to 'tests/suite')
-rwxr-xr-xtests/suite/testcompat-main-openssl17
-rwxr-xr-xtests/suite/testcompat-main-polarssl8
2 files changed, 22 insertions, 3 deletions
diff --git a/tests/suite/testcompat-main-openssl b/tests/suite/testcompat-main-openssl
index a4921696b9..7ce77a27d6 100755
--- a/tests/suite/testcompat-main-openssl
+++ b/tests/suite/testcompat-main-openssl
@@ -409,10 +409,16 @@ run_client_suite() {
fi
}
+WAITPID=""
for mod in "" ":%COMPAT" ":%NO_ETM"; do #":%NO_TICKETS" ":%DISABLE_SAFE_RENEGOTIATION"
run_client_suite $mod &
+ WAITPID="$WAITPID $!"
+done
+
+for i in "$WAITPID";do
+ wait $i
+ test $? != 0 && exit 1
done
-wait
echo "${PREFIX}Client mode tests were successfully completed"
echo "${PREFIX}"
@@ -778,9 +784,16 @@ run_server_suite() {
kill ${PID}
wait
}
+
+WAITPID=""
for mod in "" ":%COMPAT" ":%NO_ETM" ":%NO_TICKETS" ":%DISABLE_SAFE_RENEGOTIATION"; do
run_server_suite $mod &
+ WAITPID="$WAITPID $!"
+done
+
+for i in "$WAITPID";do
+ wait $i
+ test $? != 0 && exit 1
done
-wait
exit 0
diff --git a/tests/suite/testcompat-main-polarssl b/tests/suite/testcompat-main-polarssl
index f1d76d05dc..da0b1d2d43 100755
--- a/tests/suite/testcompat-main-polarssl
+++ b/tests/suite/testcompat-main-polarssl
@@ -428,10 +428,16 @@ run_server_suite() {
wait
}
+WAITPID=""
for mod in "" ":%COMPAT" ":%NO_ETM"; do #":%NO_TICKETS" ":%DISABLE_SAFE_RENEGOTIATION"
run_server_suite $mod &
+ WAITPID="$WAITPID $!"
+done
+
+for i in "$WAITPID";do
+ wait $i
+ test $? != 0 && exit 1
done
-wait
rm -f "${LOGFILE}"