diff options
author | Christian Fuchs <christian.fuchs@cfuchs.net> | 2013-10-18 14:50:56 +0000 |
---|---|---|
committer | Christian Fuchs <christian.fuchs@cfuchs.net> | 2013-10-18 14:50:56 +0000 |
commit | 02eef607379528f1a28c8593dd98e233fcbefd69 (patch) | |
tree | 2c8e8636091779c5c6ad9347b813817a3f7c0257 | |
parent | 17b79681e95d1e1ba5d6c410606ef2bb854f5d9f (diff) | |
download | gnunet-02eef607379528f1a28c8593dd98e233fcbefd69.tar.gz gnunet-02eef607379528f1a28c8593dd98e233fcbefd69.zip |
fixed PID checking and this the kill feature
-rwxr-xr-x | src/scalarproduct/test_scalarproduct.sh | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/src/scalarproduct/test_scalarproduct.sh b/src/scalarproduct/test_scalarproduct.sh index 0a0fc6578..5f335db3c 100755 --- a/src/scalarproduct/test_scalarproduct.sh +++ b/src/scalarproduct/test_scalarproduct.sh | |||
@@ -1,8 +1,8 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # compute a simple scalar product | 2 | # compute a simple scalar product |
3 | # payload for this test: | 3 | # payload for this test: |
4 | INPUTALICE="-k AAAA -e 10,10,10" | 4 | INPUTALICE="-k AAAA -e 3,3,-1" |
5 | INPUTBOB="-k AAAA -e 10,10,10" | 5 | INPUTBOB="-k AAAA -e 1000,100,24" |
6 | 6 | ||
7 | # necessary to make the testing prefix deterministic, so we can access the config files | 7 | # necessary to make the testing prefix deterministic, so we can access the config files |
8 | PREFIX=/tmp/test-scalarproduct`date +%H%M%S` | 8 | PREFIX=/tmp/test-scalarproduct`date +%H%M%S` |
@@ -17,25 +17,36 @@ CFGBOB="-c $PREFIX/1/config" | |||
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='scalarproduct;;;;DEBUG' GNUNET_TESTING_PREFIX=$PREFIX ../testbed/gnunet-testbed-profiler -n -c test_scalarproduct.conf -p 2 2>service.log & |
20 | sleep 5 | 20 | PID=$! |
21 | 21 | ||
22 | echo $PID | ||
23 | read | ||
24 | sleep 5 | ||
22 | # get bob's peer ID, necessary for alice | 25 | # get bob's peer ID, necessary for alice |
23 | PEERIDBOB=`gnunet-peerinfo -qs $CFGBOB` | 26 | PEERIDBOB=`gnunet-peerinfo -qs $CFGBOB` |
24 | 27 | ||
25 | GNUNET_LOG='scalarproduct;;;;DEBUG' gnunet-scalarproduct $CFGBOB $INPUTBOB 2>bob.log & | 28 | GNUNET_LOG='scalarproduct;;;;DEBUG' gnunet-scalarproduct $CFGBOB $INPUTBOB 2>bob.log & |
26 | GNUNET_LOG='scalarproduct;;;;DEBUG' gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB 2>alice.log | 29 | RESULT=`GNUNET_LOG='scalarproduct;;;;DEBUG' gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB 2>alice.log` |
30 | RESULT=`printf "%X\n" "0x$RESULT"` | ||
31 | |||
32 | cat alice.log bob.log service.log >> test_scalarproduct.log | ||
33 | rm -f alice.log bob.log service.log | ||
34 | ISSUES=$((`grep scalarproduct test_scalarproduct.log | grep -c ERROR` + `grep scalarproduct test_scalarproduct.log | grep -c WARNING`)) | ||
27 | 35 | ||
28 | # termiante the testbed | 36 | # terminate the testbed |
29 | kill $( pgrep -P $$ | tr '\n' ' ' ) | 37 | kill $PID |
30 | #rm alice.log bob.log service.log | ||
31 | 38 | ||
32 | EXPECTED="12C" | 39 | EXPECTED="CCC" |
33 | if [ "$RESULT" == "$EXPECTED" ] | 40 | if [ "$ISSUES" -eq "0" ] |
34 | then | 41 | then |
35 | echo "OK" | 42 | if [ "$RESULT" == "$EXPECTED" ] |
36 | exit 0 | 43 | then |
44 | echo "OK" | ||
45 | rm -f test_scalarproduct.log | ||
46 | exit 0 | ||
47 | fi | ||
37 | else | 48 | else |
38 | echo "Result $RESULT NOTOK" | 49 | echo "Result $RESULT NOTOK, see $PWD/test_scalarproduct.log for details" |
39 | exit 1 | 50 | exit 1 |
40 | fi | 51 | fi |
41 | 52 | ||