[GNUnet-SVN] r31498 - in gnunet/src: namestore scalarproduct

[gnunet]

Author: grothoff
Date: 2013-12-17 20:44:08 +0100 (Tue, 17 Dec 2013)
New Revision: 31498

Modified:
   gnunet/src/namestore/test_namestore_delete.sh
   gnunet/src/namestore/test_namestore_lookup.sh
   gnunet/src/namestore/test_namestore_put.sh
   gnunet/src/scalarproduct/test_scalarproduct.sh
   gnunet/src/scalarproduct/test_scalarproduct_negative.sh
   gnunet/src/scalarproduct/test_scalarproduct_negativezero.sh
Log:
-do not log at DEBUG in testcases (at least not in SVN), do not print random 
stuff to stdout

Modified: gnunet/src/namestore/test_namestore_delete.sh
===================================================================
--- gnunet/src/namestore/test_namestore_delete.sh       2013-12-17 19:33:20 UTC 
(rev 31497)
+++ gnunet/src/namestore/test_namestore_delete.sh       2013-12-17 19:44:08 UTC 
(rev 31498)
@@ -7,10 +7,10 @@
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version
+$LOCATION --version &> /dev/null
 if test $? != 0
 then
-       echo "GNUnet command line tools cannot be found, check environmental 
variables PATH and GNUNET_PREFIX" 
+       echo "GNUnet command line tools cannot be found, check environmental 
variables PATH and GNUNET_PREFIX"
        exit 77
 fi
 

Modified: gnunet/src/namestore/test_namestore_lookup.sh
===================================================================
--- gnunet/src/namestore/test_namestore_lookup.sh       2013-12-17 19:33:20 UTC 
(rev 31497)
+++ gnunet/src/namestore/test_namestore_lookup.sh       2013-12-17 19:44:08 UTC 
(rev 31498)
@@ -7,10 +7,10 @@
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version
+$LOCATION --version &> /dev/null
 if test $? != 0
 then
-       echo "GNUnet command line tools cannot be found, check environmental 
variables PATH and GNUNET_PREFIX" 
+       echo "GNUnet command line tools cannot be found, check environmental 
variables PATH and GNUNET_PREFIX"
        exit 77
 fi
 

Modified: gnunet/src/namestore/test_namestore_put.sh
===================================================================
--- gnunet/src/namestore/test_namestore_put.sh  2013-12-17 19:33:20 UTC (rev 
31497)
+++ gnunet/src/namestore/test_namestore_put.sh  2013-12-17 19:44:08 UTC (rev 
31498)
@@ -7,10 +7,10 @@
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version
+$LOCATION --version &> /dev/null
 if test $? != 0
 then
-       echo "GNUnet command line tools cannot be found, check environmental 
variables PATH and GNUNET_PREFIX" 
+       echo "GNUnet command line tools cannot be found, check environmental 
variables PATH and GNUNET_PREFIX"
        exit 77
 fi
 

Modified: gnunet/src/scalarproduct/test_scalarproduct.sh
===================================================================
--- gnunet/src/scalarproduct/test_scalarproduct.sh      2013-12-17 19:33:20 UTC 
(rev 31497)
+++ gnunet/src/scalarproduct/test_scalarproduct.sh      2013-12-17 19:44:08 UTC 
(rev 31498)
@@ -13,10 +13,11 @@
 
 # launch two peers in line topology non-interactively
 #
-# interactive mode would terminate the test immediately 
-# because the rest of the script is already in stdin, 
+# 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 &
+#GNUNET_LOG='scalarproduct;;;;DEBUG'
+GNUNET_TESTING_PREFIX=$PREFIX ../testbed/gnunet-testbed-profiler -n -c 
test_scalarproduct.conf -p 2 &
 PID=$!
 # sleep 1 is too short on most systems, 2 works on most, 5 seems to be safe
 sleep 5
@@ -24,11 +25,13 @@
 # get bob's peer ID, necessary for alice
 PEERIDBOB=`gnunet-peerinfo -qs $CFGBOB`
 
-GNUNET_LOG=';;;;DEBUG' gnunet-scalarproduct $CFGBOB $INPUTBOB &
-RESULT=`GNUNET_LOG=';;;;DEBUG' gnunet-scalarproduct $CFGALICE $INPUTALICE -p 
$PEERIDBOB`
+#GNUNET_LOG=';;;;DEBUG'
+gnunet-scalarproduct $CFGBOB $INPUTBOB &
+GNUNET_LOG=';;;;DEBUG'
+RESULT=`gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB`
 
 # terminate the testbed
-kill $PID 
+kill $PID
 
 EXPECTED="0CCC"
 if [ "$RESULT" == "$EXPECTED" ]

Modified: gnunet/src/scalarproduct/test_scalarproduct_negative.sh
===================================================================
--- gnunet/src/scalarproduct/test_scalarproduct_negative.sh     2013-12-17 
19:33:20 UTC (rev 31497)
+++ gnunet/src/scalarproduct/test_scalarproduct_negative.sh     2013-12-17 
19:44:08 UTC (rev 31498)
@@ -13,10 +13,11 @@
 
 # launch two peers in line topology non-interactively
 #
-# interactive mode would terminate the test immediately 
-# because the rest of the script is already in stdin, 
+# 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 &
+#GNUNET_LOG='scalarproduct;;;;DEBUG'
+GNUNET_TESTING_PREFIX=$PREFIX ../testbed/gnunet-testbed-profiler -n -c 
test_scalarproduct.conf -p 2 &
 PID=$!
 # sleep 1 is too short on most systems, 2 works on most, 5 seems to be safe
 sleep 5
@@ -24,11 +25,13 @@
 # get bob's peer ID, necessary for alice
 PEERIDBOB=`gnunet-peerinfo -qs $CFGBOB`
 
-GNUNET_LOG=';;;;DEBUG' gnunet-scalarproduct $CFGBOB $INPUTBOB &
-RESULT=`GNUNET_LOG=';;;;DEBUG' gnunet-scalarproduct $CFGALICE $INPUTALICE -p 
$PEERIDBOB`
+#GNUNET_LOG=';;;;DEBUG'
+gnunet-scalarproduct $CFGBOB $INPUTBOB &
+#RESULT=`GNUNET_LOG=';;;;DEBUG'
+RESULT=`gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB`
 
 # terminate the testbed
-kill $PID 
+kill $PID
 
 EXPECTED="-0CCC"
 if [ "$RESULT" == "$EXPECTED" ]

Modified: gnunet/src/scalarproduct/test_scalarproduct_negativezero.sh
===================================================================
--- gnunet/src/scalarproduct/test_scalarproduct_negativezero.sh 2013-12-17 
19:33:20 UTC (rev 31497)
+++ gnunet/src/scalarproduct/test_scalarproduct_negativezero.sh 2013-12-17 
19:44:08 UTC (rev 31498)
@@ -13,10 +13,11 @@
 
 # launch two peers in line topology non-interactively
 #
-# interactive mode would terminate the test immediately 
-# because the rest of the script is already in stdin, 
+# 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 &
+# GNUNET_LOG='scalarproduct;;;;DEBUG'
+GNUNET_TESTING_PREFIX=$PREFIX ../testbed/gnunet-testbed-profiler -n -c 
test_scalarproduct.conf -p 2 &
 PID=$!
 # sleep 1 is too short on most systems, 2 works on most, 5 seems to be safe
 sleep 5
@@ -24,11 +25,13 @@
 # get bob's peer ID, necessary for alice
 PEERIDBOB=`gnunet-peerinfo -qs $CFGBOB`
 
-GNUNET_LOG=';;;;DEBUG' gnunet-scalarproduct $CFGBOB $INPUTBOB &
-RESULT=`GNUNET_LOG=';;;;DEBUG' gnunet-scalarproduct $CFGALICE $INPUTALICE -p 
$PEERIDBOB`
+#GNUNET_LOG=';;;;DEBUG'
+gnunet-scalarproduct $CFGBOB $INPUTBOB &
+#GNUNET_LOG=';;;;DEBUG'
+RESULT=`gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB`
 
 # terminate the testbed
-kill $PID 
+kill $PID
 
 EXPECTED="00"
 if [ "$RESULT" == "$EXPECTED" ]