- Timestamp:
- Feb 4, 2015, 11:27:22 AM (8 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream
- Children:
- 8731286, c4a015b
- Parents:
- 302965e
- Location:
- test
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
test/.gitignore
r302965e r9a06bbd 16 16 *.log 17 17 *.trs 18 test.lock -
test/TestMakefile
r302965e r9a06bbd 15 15 export TEST_QUERY_DELAY ?= 2 16 16 17 TEST_LOCK := ./test.lock 18 17 19 all: setup.done 18 ./runtests20 TEST_LOCK=$(TEST_LOCK) ./runtests 19 21 20 22 t-%: setup.done 21 ./runtests $@23 TEST_LOCK=$(TEST_LOCK) ./runtests $@ 22 24 23 25 -
test/runtests
r302965e r9a06bbd 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 … … 59 64 fi 60 65 61 for t in $tests; do 62 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 63 71 export TEST_NAME="$(basename "$t")" 64 72 output="../../outputs/${TEST_NAME}.output" … … 73 81 trap apache_down_err EXIT 74 82 if [ -n "${USE_MSVA}" ]; then 75 MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT" /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start || [ -e fail.server ] 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 ] 76 87 else 77 /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start || [ -e fail.server ] 88 ${flock_cmd} \ 89 /usr/sbin/apache2 -f "$(pwd)/apache.conf" -k start \ 90 || [ -e fail.server ] 78 91 fi 79 92
Note: See TracChangeset
for help on using the changeset viewer.