Changeset 8731286 in mod_gnutls for test/runtests
- Timestamp:
- Feb 5, 2015, 1:11:44 PM (6 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream
- Children:
- eea8a16
- Parents:
- 5a8a32b (diff), 9a06bbd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
test/runtests
r5a8a32b r8731286 6 6 7 7 tests="${1##t-}" 8 9 if [ -n "${TEST_LOCK}" ]; then 10 TEST_LOCK="$(realpath ${TEST_LOCK})" 11 flock_cmd="flock -w 10 ${TEST_LOCK}" 12 fi 8 13 9 14 BADVARS=0 … … 20 25 21 26 if [ . != "$(dirname "$0")" ]; then 22 printf "You should only run this mod-gnutls test suite from the t / directory of the mod_gnutls source.\n" >&227 printf "You should only run this mod-gnutls test suite from the test/ directory of the mod_gnutls source.\n" >&2 23 28 exit 1 24 29 fi … … 37 42 printf "\nApache error logs:\n" 38 43 tail "../../logs/${TEST_NAME}.error.log" 39 stop_msva 44 if [ -n "${USE_MSVA}" ]; then 45 stop_msva 46 fi 40 47 } 41 48 … … 46 53 fi 47 54 48 GNUPGHOME=$(pwd)/msva.gnupghome MSVA_KEYSERVER_POLICY=never monkeysphere-validation-agent & 55 if [ -n "${USE_MSVA}" ]; then 56 GNUPGHOME=$(pwd)/msva.gnupghome MSVA_KEYSERVER_POLICY=never monkeysphere-validation-agent & 57 trap stop_msva EXIT 49 58 50 trap stop_msva EXIT 59 sleep "$TEST_GAP" 51 60 52 sleep "$TEST_GAP" 61 printf "TESTING: initial MSVA verification\n" 62 MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" msva-query-agent https "$(cat client.uid)" x509pem client < client/x509.pem 63 printf "\nSUCCESS: initial MSVA verification\n" 64 fi 53 65 54 printf "TESTING: initial MSVA verification\n" 55 MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" msva-query-agent https "$(cat client.uid)" x509pem client < client/x509.pem 56 printf "\nSUCCESS: initial MSVA verification\n" 57 58 for t in $tests; do 59 sleep "$TEST_GAP" 66 for t in $tests; do 67 if [ -z "${flock_cmd}" ]; then 68 echo "Warning: no lock file set" 69 sleep "$TEST_GAP" 70 fi 60 71 export TEST_NAME="$(basename "$t")" 61 72 output="../../outputs/${TEST_NAME}.output" … … 69 80 printf "TESTING: %s%s\n" "$TEST_NAME" "$EXPECTED_FAILURE" 70 81 trap apache_down_err EXIT 71 MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start || [ -e fail.server ] 82 if [ -n "${USE_MSVA}" ]; then 83 ${flock_cmd} \ 84 MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" \ 85 /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start \ 86 || [ -e fail.server ] 87 else 88 ${flock_cmd} \ 89 /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start \ 90 || [ -e fail.server ] 91 fi 72 92 73 93 if (sed "s/__HOSTNAME__/${TEST_HOST}/" < ./input && sleep "$TEST_QUERY_DELAY") | \ … … 88 108 fi 89 109 /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k stop || [ -e fail.server ] 90 trap stop_msva EXIT 110 if [ -n "${USE_MSVA}" ]; then 111 trap stop_msva EXIT 112 else 113 trap - EXIT 114 fi 91 115 printf "SUCCESS: %s\n" "$TEST_NAME" 92 116 cd ../.. 93 117 done 94 118 95 stop_msva 119 if [ -n "${USE_MSVA}" ]; then 120 stop_msva 121 fi
Note: See TracChangeset
for help on using the changeset viewer.