diff options
author | Christian Fuchs <christian.fuchs@cfuchs.net> | 2013-10-18 23:13:19 +0000 |
---|---|---|
committer | Christian Fuchs <christian.fuchs@cfuchs.net> | 2013-10-18 23:13:19 +0000 |
commit | ee34e30d52f46b6a90578bd48172536392d2d5bf (patch) | |
tree | 2050c6befda04274c666d5ca5072150ee7e9b570 /src/scalarproduct/test_scalarproduct.sh | |
parent | 36a80c833a5d5eb8f30460bb484cac01bdd9b65c (diff) | |
download | gnunet-ee34e30d52f46b6a90578bd48172536392d2d5bf.tar.gz gnunet-ee34e30d52f46b6a90578bd48172536392d2d5bf.zip |
removed final non functional dead leftover code from gaurav... may that code be forgotten
testcases now do better logging together with make check
made testcases a bit more tolerat for really slow systems (5 seconds should suffice even on older systems)
activated new checks in Makefile
Diffstat (limited to 'src/scalarproduct/test_scalarproduct.sh')
-rwxr-xr-x | src/scalarproduct/test_scalarproduct.sh | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/scalarproduct/test_scalarproduct.sh b/src/scalarproduct/test_scalarproduct.sh index 82b42e992..7b183d0b5 100755 --- a/src/scalarproduct/test_scalarproduct.sh +++ b/src/scalarproduct/test_scalarproduct.sh | |||
@@ -16,34 +16,27 @@ CFGBOB="-c $PREFIX/1/config" | |||
16 | # interactive mode would terminate the test immediately | 16 | # interactive mode would terminate the test immediately |
17 | # because the rest of the script is already in stdin, | 17 | # because the rest of the script is already in stdin, |
18 | # thus redirecting stdin does not suffice) | 18 | # thus redirecting stdin does not suffice) |
19 | GNUNET_LOG='scalarproduct;;;;DEBUG' GNUNET_TESTING_PREFIX=$PREFIX ../testbed/gnunet-testbed-profiler -n -c test_scalarproduct.conf -p 2 2>service.log & | 19 | GNUNET_LOG=';;;;DEBUG' GNUNET_TESTING_PREFIX=$PREFIX ../testbed/gnunet-testbed-profiler -n -c test_scalarproduct.conf -p 2 & |
20 | PID=$! | 20 | PID=$! |
21 | # sleep 1 is too short on most systems, 2 works on most, 5 seems to be safe | ||
21 | sleep 5 | 22 | sleep 5 |
22 | 23 | ||
23 | # get bob's peer ID, necessary for alice | 24 | # get bob's peer ID, necessary for alice |
24 | PEERIDBOB=`gnunet-peerinfo -qs $CFGBOB` | 25 | PEERIDBOB=`gnunet-peerinfo -qs $CFGBOB` |
25 | 26 | ||
26 | GNUNET_LOG='scalarproduct;;;;DEBUG' gnunet-scalarproduct $CFGBOB $INPUTBOB 2>bob.log & | 27 | GNUNET_LOG=';;;;DEBUG' gnunet-scalarproduct $CFGBOB $INPUTBOB & |
27 | RESULT=`GNUNET_LOG='scalarproduct;;;;DEBUG' gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB 2>alice.log` | 28 | RESULT=`GNUNET_LOG=';;;;DEBUG' gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB` |
28 | |||
29 | cat alice.log bob.log service.log >> test_scalarproduct.log | ||
30 | rm -f alice.log bob.log service.log | ||
31 | ISSUES=$((`grep scalarproduct test_scalarproduct.log | grep -c ERROR` + `grep scalarproduct test_scalarproduct.log | grep -c WARNING`)) | ||
32 | 29 | ||
33 | # terminate the testbed | 30 | # terminate the testbed |
34 | kill $PID | 31 | kill $PID |
35 | 32 | ||
36 | EXPECTED="0CCC" | 33 | EXPECTED="0CCC" |
37 | if [ "$ISSUES" -eq "0" ] | 34 | if [ "$RESULT" == "$EXPECTED" ] |
38 | then | 35 | then |
39 | if [ "$RESULT" == "$EXPECTED" ] | 36 | echo "OK" |
40 | then | 37 | exit 0 |
41 | echo "OK" | ||
42 | rm -f test_scalarproduct.log | ||
43 | exit 0 | ||
44 | fi | ||
45 | else | 38 | else |
46 | echo "Result $RESULT NOTOK, see $PWD/test_scalarproduct.log for details" | 39 | echo "Result $RESULT NOTOK" |
47 | exit 1 | 40 | exit 1 |
48 | fi | 41 | fi |
49 | 42 | ||