Turn off randomization

Former-commit-id: 082b200988d62548ecf10bc17fd74b2b55ec9e83

tools/do_manual_cover.sh

@@ -22,7 +22,7 @@ touch $AGGREGATE_COVERAGE
 
 for testname in `ls $MANUAL_TEST_DIR`
 do
-  echo "do moi: $MANUAL_TEST_DIR/$testname/spec/$COVER_SCRIPT"
+  echo "do_manual_cover.sh: $MANUAL_TEST_DIR/$testname/spec/$COVER_SCRIPT"
 
   cd $MANUAL_TEST_DIR/$testname/spec/
   $MANUAL_TEST_DIR/$testname/spec/$COVER_SCRIPT

tools/manual_cover.sh

+#!/bin/sh
+
 # Coverage tool for manual tests
 #
 # Usage:
@@ -17,6 +19,6 @@ shift
 FULL_COMMAND=$*
 
 # We use pin for extracting coverage info
-$PEASOUP_HOME/tools/pin/pin -t $PEASOUP_HOME/tools/pin/itraceunique.so -- $FULL_COMMAND
+setarch i386 -RL $PEASOUP_HOME/tools/pin/pin -t $PEASOUP_HOME/tools/pin/itraceunique.so -- $FULL_COMMAND
 
 cat itrace.out | grep -v eof > $OUTPUT_FILE

tools/manual_test_import.sh

@@ -33,7 +33,7 @@ do
   shift
 done
 
-TEST_TIMEOUT=30
+TEST_TIMEOUT=60
 
 echo "TEST_NAME = $TEST_NAME"
 echo "INFILES = $INFILES"
@@ -119,7 +119,7 @@ done
 for i in $OUTFILES
 do
   echo " rm $i 2>/dev/null" >> $TEST_ORIG_CMD_SCRIPT
-  echo " rm $TEST_ORIG_OUTPUT_DIR/$i 2>/dev/null" >> $TEST_ORIG_CMD_SCRIPT
+  echo " rm $SPEC_OUTPUT_DIR/$i 2>/dev/null" >> $TEST_ORIG_CMD_SCRIPT
 done
 
 # stage in input (if any)
@@ -140,6 +140,8 @@ cp a.ncexe $TEST_SPEC_DIR/$PROG
 #
 touch $TEST_XFORMED_CMD_SCRIPT
 
+echo "#!/bin/sh" >> $TEST_XFORMED_CMD_SCRIPT
+
 # cleanup input/output files
 for i in $INFILES
 do
@@ -163,7 +165,7 @@ done
 
 # run command (check for seg faults)
 # @todo: we should really register the program exit code and check against it
-echo "STRATA_SPRI_FILE=\$1 timeout $TEST_TIMEOUT $CMD" >> $TEST_XFORMED_CMD_SCRIPT
+echo "STRATA_SPRI_FILE=\$1 timeout $TEST_TIMEOUT setarch i386 -RL $CMD" >> $TEST_XFORMED_CMD_SCRIPT
 echo "status=\$?" >> $TEST_XFORMED_CMD_SCRIPT
 echo "echo \$status" >> $TEST_XFORMED_CMD_SCRIPT