[GNUnet-SVN] r30205 - gnunet/src/scalarproduct

[gnunet]

Author: cfuchs
Date: 2013-10-15 17:28:33 +0200 (Tue, 15 Oct 2013)
New Revision: 30205

Modified:
   gnunet/src/scalarproduct/test_scalarproduct.sh
Log:
more work on the sp_test


Modified: gnunet/src/scalarproduct/test_scalarproduct.sh
===================================================================
--- gnunet/src/scalarproduct/test_scalarproduct.sh      2013-10-15 15:01:17 UTC 
(rev 30204)
+++ gnunet/src/scalarproduct/test_scalarproduct.sh      2013-10-15 15:28:33 UTC 
(rev 30205)
@@ -1,27 +1,21 @@
 #!/bin/bash
 
 #necessary to make the testing prefix deterministic, so we can access the 
config files
-GNUNET_TESTING_PREFIX=/tmp/test-scalarproduct1337
-CFGA="-c ./test_scalarproduct_alice.conf"
-CFGB="-c ./test_scalarproduct_bob.conf"
-                                       #can't use ` directly
-SESSIONDATA="-k AAAA -e 10,10,10"
-EXPECTED="2C0"
+GNUNET_TESTING_PREFIX=/tmp/test-scalarproduct`date +%H%M%S`
+CFGALICE="-c $GNUNET_TESTING_PREFIX/0/config"
+CFGBOB="-c $GNUNET_TESTING_PREFIX/1/config"
 
-gnunet-arm -s $CFGA
-sleep 2
-gnunet-arm -s $CFGB
-sleep 2
+../testbed/gnunet-testbed-profiler -c test_scalarproduct.conf -p 2 
2>gnunet_error.log &
+sleep 5
 
-IDB=`gnunet-peerinfo -s $CFGB | awk -F "\x60" '{print $2}' | awk -F "'" 
'{print $1}'`
+PEERIDBOB=`gnunet-peerinfo -qs $CFGB`
+INPUTALICE="-k AAAA -e 10,10,10"
+INPUTBOB="-k AAAA -e 10,10,10"
+EXPECTED="2C0"
 
-gnunet-scalarproduct $CFGB $SESSIONDATA
+gnunet-scalarproduct $CFGBOB $INPUTBOB
+RESULT=`gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB 
2>client_error.log`
 
-RESULT=`gnunet-scalarproduct $CFGA $SESSIONDATA -p $IDB`
-
-gnunet-arm -e $CFGA &
-gnunet-arm -e $CFGB &
-
 if [ "$RESULT" == "$EXPECTED" ]
 then
   echo "OK"