just build host

scripts/competition.sh

@@ -102,7 +102,7 @@ mkdir -p $logs
 lf="$logs/competition.log"
 progress "competition" 1 "Starting -- logging to $lf"
 truncate "$lf"
-run_remote "$testinghost" "$python $scripts/competition.py -m $num_bugs -n $min_yield $bug_list -e $exit_code $diversify $skipinject --bugtypes=$bugtypes $usechaff $hostjson $project_name" "$lf"
+run_remote "$buildhost" "$python $scripts/competition.py -m $num_bugs -n $min_yield $bug_list -e $exit_code $diversify $skipinject --bugtypes=$bugtypes $usechaff $hostjson $project_name" "$lf"
 progress "competition" 1 "Everything finished."
 
 tail -n3 $lf

scripts/inject.sh

@@ -76,7 +76,7 @@ mkdir -p $logs
 lf="$logs/inject.log"
 progress "inject" 1 "Starting -- logging to $lf"
 truncate "$lf"
-run_remote "$testinghost" "$python $scripts/inject.py -m $num_bugs $bug_list -e $exit_code $dataflow $json" "$lf"
+run_remote "$buildhost" "$python $scripts/inject.py -m $num_bugs $bug_list -e $exit_code $dataflow $json" "$lf"
 grep yield "$lf"
 
 progress "inject" 1 "Finished."

scripts/lava.sh

@@ -26,8 +26,7 @@
 # directory:   where you want source to build
 # name:        a name for this project (used to create directories)
 # inputs:      a list of inputs that will be used to find potential bugs (think coverage)
-# buildhost:   what remote host to build source on
-# testinghost: what host to test injected bugs on
+# buildhost:   what remote host to build source and test injected bugs on
 # fixupscript: script to run after add_query to fix up src before make
 #
 
@@ -248,7 +247,7 @@ if [ $inject -eq 1 ]; then
         if [ "$injfixupsscript" != "null" ]; then
             fix="--fixupsscript='$injfixupsscript'"
         fi
-        run_remote "$testinghost" "$python $scripts/inject.py -t $bugtypes -m $many -e $exitCode $kt $fix $hostjson $project_name" "$lf"
+        run_remote "$buildhost" "$python $scripts/inject.py -t $bugtypes -m $many -e $exitCode $kt $fix $hostjson $project_name" "$lf"
     grep yield "$lf"  | grep " real bugs "
     done
 fi

scripts/vars.sh

@@ -26,7 +26,6 @@ config_dir="$(jq -r '.config_dir // ""' $hostjson)/$project_name"
 tar_dir="$(jq -r '.tar_dir // ""' $hostjson)"
 db_suffix="$(jq -r '.db_suffix // ""' $hostjson)"
 buildhost="$(jq -r '.buildhost // "localhost"' $hostjson)"
-testinghost="$(jq -r '.testinghost // "localhost"' $hostjson)"
 dockername="$(jq -r '.docker // "lava32"' $hostjson)"
 pguser="$(jq -r '.pguser // "postgres"' $hostjson)"
 pgpass="$(jq -r '.pgpass // "postgrespostgres"' $hostjson)"