From: Brian Norris <banorris@uci.edu>
Date: Thu, 6 Dec 2012 23:03:21 +0000 (-0800)
Subject: run.sh: sync up run script with model-checker
X-Git-Tag: oopsla2013-final~50
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker-benchmarks.git;a=commitdiff_plain;h=43d5b7da66c7ef82af941805564db860191cf157

run.sh: sync up run script with model-checker

I improved the model-checker.git run script, so paste over the changes.
---

diff --git a/run.sh b/run.sh
index 459ffd8..f2bfcda 100755
--- a/run.sh
+++ b/run.sh
@@ -2,8 +2,9 @@
 #
 # Runs a simple test (default: ./barrier/barrier)
 # Syntax:
-#  ./run.sh [gdb]
-#  ./run.sh [test program] [gdb]
+#  ./run.sh [test program] [OPTIONS]
+#  ./run.sh [OPTIONS]
+#  ./run.sh [gdb [test program]]
 #
 # If you include a 'gdb' argument, the your program will be launched with gdb.
 # You can also supply a test program argument to run something besides the
@@ -11,14 +12,12 @@
 #
 
 BIN=./barrier/barrier
+PREFIX=
 
 export LD_LIBRARY_PATH=..
 
-[ $# -gt 0 ] && [ "$1" != "gdb" ] && BIN=$1 && shift
+[ $# -gt 0 ] && [ "$1" = "gdb" ] && PREFIX=gdb && shift
+[ $# -gt 0 ] && [ -x "$1" ] && [ -f "$1" ] && BIN="$1" && shift
 
-if [ $# -gt 0 ] && [ "$1" = "gdb" ]; then
-	shift
-	gdb $BIN $@
-fi
-
-$BIN $@
+set -x
+$PREFIX $BIN $@