aboutsummaryrefslogtreecommitdiff
path: root/src/scalarproduct/test_scalarproduct.sh
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-06-27 14:00:15 +0000
committerChristian Grothoff <christian@grothoff.org>2016-06-27 14:00:15 +0000
commitb0990df82b0e8ff831cbb01ed9fd1d6b4e592b8e (patch)
treecb99ed260752778cb0703edb141a732357b9dd25 /src/scalarproduct/test_scalarproduct.sh
parent7ee0ec4b90a2096226f4dc23f9129fdda1c71488 (diff)
downloadgnunet-b0990df82b0e8ff831cbb01ed9fd1d6b4e592b8e.tar.gz
gnunet-b0990df82b0e8ff831cbb01ed9fd1d6b4e592b8e.zip
add timeouts to test
Diffstat (limited to 'src/scalarproduct/test_scalarproduct.sh')
-rwxr-xr-xsrc/scalarproduct/test_scalarproduct.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/scalarproduct/test_scalarproduct.sh b/src/scalarproduct/test_scalarproduct.sh
index dd9bb80a5..c0401beb7 100755
--- a/src/scalarproduct/test_scalarproduct.sh
+++ b/src/scalarproduct/test_scalarproduct.sh
@@ -25,13 +25,15 @@ echo "Waiting for peers to start..."
25sleep 5 25sleep 5
26echo "Running test..." 26echo "Running test..."
27 27
28which timeout &> /dev/null && DO_TIMEOUT="timeout 15"
29
28# get bob's peer ID, necessary for alice 30# get bob's peer ID, necessary for alice
29PEERIDBOB=`gnunet-peerinfo -qs $CFGBOB` 31PEERIDBOB=`${DO_TIMEOUT} gnunet-peerinfo -qs $CFGBOB`
30 32
31#GNUNET_LOG=';;;;DEBUG' 33#GNUNET_LOG=';;;;DEBUG'
32gnunet-scalarproduct $CFGBOB $INPUTBOB & 34${DO_TIMEOUT} gnunet-scalarproduct $CFGBOB $INPUTBOB &
33#GNUNET_LOG=';;;;DEBUG' 35#GNUNET_LOG=';;;;DEBUG'
34RESULT=`gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB` 36RESULT=`${DO_TIMEOUT} gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB`
35 37
36# terminate the testbed 38# terminate the testbed
37kill $PID 39kill $PID
@@ -44,4 +46,3 @@ else
44 echo "Result $RESULT, expected $EXPECTED - NOTOK" 46 echo "Result $RESULT, expected $EXPECTED - NOTOK"
45 exit 1 47 exit 1
46fi 48fi
47