Let user specify subset of jobs to be run (awslabs#607)

Additionally, check for cbmc, cbmc-batch and aws. Plus minor fixes.

Author: cmangla

.cbmc-batch/cbmc-batch.sh

@@ -13,19 +13,43 @@
 # implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
-opt="$1"
+opt="$1"; shift
 result="results.txt"
 
-# Start CBMC Batch Jobs
-if [ "$opt" = "--start" ]; then
+COMMANDS_IN_PATH=true
+for i in cbmc-batch cbmc-status aws cbmc-kill cbmc; do
+    command -v "$i" >/dev/null 2>&1 || {
+        echo >&2 "Command $i required in \$PATH";
+        COMMANDS_IN_PATH=false;
+    }
+done
+if [ "$COMMANDS_IN_PATH" = false ]; then
+    echo >&2 "Aborting."
+    exit 1;
+fi
+
+script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+cd "$script_dir" || { echo "Cannot change directory to $script_dir"; exit 1; }
+
+if [ "$#" = "0" ]; then
+    all_jobs=""
     for job in jobs/*/; do
         job=${job%/} #remove trailing slash
         job=${job#*/} #job name
+        all_jobs="$all_jobs $job"
+    done
+else
+    all_jobs="$@"
+fi
+
+# Start CBMC Batch Jobs
+if [ "$opt" = "--start" ]; then
+    for job in $all_jobs; do
         echo "Starting job $job"
             cbmc-batch \
                 --no-report \
                 --no-coverage \
-                --wsdir jobs/$job \
+                --wsdir jobs/"$job" \
                 --srcdir ../ \
                 --jobprefix $job-local \
                 --yaml jobs/$job/cbmc-batch.yaml
@@ -36,18 +60,21 @@ elif [ "$opt" = "--end" ]; then
         rm $result
     fi
     for Makefile in Makefile-*-local-*; do
-        make -f $Makefile monitor
-        make -f $Makefile copy
+        make -f "$Makefile" monitor
+        make -f "$Makefile" copy
         dir=${Makefile#*-} # directory name from copy
         job=${dir%-local-*-*} # original job name
-        check="$( python check_result.py $dir jobs/$job/cbmc-batch.yaml )"
+        check="$( python3 check_result.py "$dir" jobs/"$job"/cbmc-batch.yaml )"
         echo "$job: $check" >> $result
     done
 # Cleanup
 elif [ "$opt" = "--cleanup" ]; then
     for Makefile in Makefile-*-local-*; do
-        make -f $Makefile cleanup
+        make -f "$Makefile" cleanup
     done
+elif [ "$opt" = "--lsjobs" ]; then
+    echo $all_jobs | tr '[[:space:]]' '\n'
 else
-    echo "Specify option --start to start jobs, --end to check results, and --cleanup to cleanup bookkeeping"
+    echo "Specify option --start to start jobs, --end to check results,"\
+    "--cleanup to cleanup bookkeeping and --lsjobs to list jobs"
 fi

.cbmc-batch/check_result.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 # Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You may not use
@@ -22,25 +23,25 @@ def check_result():
     parser.add_argument("yaml", help = "The yaml containing expected CBMC Batch result substring.")
     args = parser.parse_args()
     if not os.path.isfile(args.yaml):
-        print "Expected file " + args.yaml + ": Not found"
+        print("Expected file " + args.yaml + ": Not found")
         return
     with open(args.yaml, "r") as yaml_file:
         try:
             expected = yaml.load(yaml_file)["expected"]
         except yaml.YAMLError as e:
-            print e
+            print(e)
             return
         except KeyError as e:
-            print "Expected CBMC Batch result not found in " + args.yaml
+            print("Expected CBMC Batch result not found in " + args.yaml)
             return
     cbmc_output = os.path.join(args.batch_result_dir, "cbmc.txt")
     if not os.path.isfile(cbmc_output):
-        print "Expected file " + cbmc_output + ": Not found"
+        print("Expected file " + cbmc_output + ": Not found")
     with open(cbmc_output, "r") as cbmc:
         if expected in cbmc.read():
-            print "Expected output matches."
+            print("Expected output matches.")
         else:
-            print "Expected output does not match."
+            print("Expected output does not match.")
 
 if __name__ == "__main__":
     check_result()