clean up for configs

[oweals/gnunet.git] / src / scalarproduct / test_scalarproduct.sh

diff --git a/src/scalarproduct/test_scalarproduct.sh b/src/scalarproduct/test_scalarproduct.sh
index 5f335db3c0d4b82f8ba8a006040178ecc6f9e021..5ba94f6416b89c7efed8a3c318bbc91a094c6f95 100755 (executable)
--- a/src/scalarproduct/test_scalarproduct.sh
+++ b/src/scalarproduct/test_scalarproduct.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 # compute a simple scalar product
 # payload for this test:
-INPUTALICE="-k AAAA -e 3,3,-1"
-INPUTBOB="-k AAAA -e 1000,100,24"
+INPUTALICE="-k CCC -e 3,3,-1"
+INPUTBOB="-k CCC -e 1000,100,24"
 
 # necessary to make the testing prefix deterministic, so we can access the config files
 PREFIX=/tmp/test-scalarproduct`date +%H%M%S`
@@ -16,37 +16,27 @@ CFGBOB="-c $PREFIX/1/config"
 # interactive mode would terminate the test immediately 
 # because the rest of the script is already in stdin, 
 # thus redirecting stdin does not suffice)
-GNUNET_LOG='scalarproduct;;;;DEBUG' GNUNET_TESTING_PREFIX=$PREFIX ../testbed/gnunet-testbed-profiler -n -c test_scalarproduct.conf -p 2 2>service.log &
+GNUNET_LOG='scalarproduct;;;;DEBUG' GNUNET_TESTING_PREFIX=$PREFIX ../testbed/gnunet-testbed-profiler -n -c test_scalarproduct.conf -p 2 &
 PID=$!
-
-echo $PID
-read
+# sleep 1 is too short on most systems, 2 works on most, 5 seems to be safe
 sleep 5
+
 # get bob's peer ID, necessary for alice
 PEERIDBOB=`gnunet-peerinfo -qs $CFGBOB`
 
-GNUNET_LOG='scalarproduct;;;;DEBUG' gnunet-scalarproduct $CFGBOB $INPUTBOB 2>bob.log &
-RESULT=`GNUNET_LOG='scalarproduct;;;;DEBUG' gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB 2>alice.log`
-RESULT=`printf "%X\n" "0x$RESULT"`
-
-cat alice.log bob.log service.log >> test_scalarproduct.log
-rm -f alice.log bob.log service.log
-ISSUES=$((`grep scalarproduct test_scalarproduct.log | grep -c ERROR` + `grep scalarproduct test_scalarproduct.log | grep -c WARNING`))
+GNUNET_LOG=';;;;DEBUG' gnunet-scalarproduct $CFGBOB $INPUTBOB &
+RESULT=`GNUNET_LOG=';;;;DEBUG' gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB`
 
 # terminate the testbed
 kill $PID 
 
-EXPECTED="CCC"
-if [ "$ISSUES" -eq "0" ]
+EXPECTED="0CCC"
+if [ "$RESULT" == "$EXPECTED" ]
 then
-       if [ "$RESULT" == "$EXPECTED" ]
-       then
-         echo "OK"
-          rm -f test_scalarproduct.log
-         exit 0
-       fi
+       echo "OK"
+       exit 0
 else
-  echo "Result $RESULT NOTOK, see $PWD/test_scalarproduct.log for details"
-  exit 1
+       echo "Result $RESULT NOTOK"
+       exit 1
 fi