X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker-benchmarks.git;a=blobdiff_plain;f=run.sh;h=7f554e7bb4b29e0c47fcc2e7003ce2022fb66dfe;hp=459ffd88c9c0839e6e281f61a177da5cbcc62f7e;hb=bd72205f6e95bd471c13dcf74476d44b40e9a56d;hpb=46299e328b9f0a8624fd753fcab5a33085eabfaa

diff --git a/run.sh b/run.sh
index 459ffd8..7f554e7 100755
--- a/run.sh
+++ b/run.sh
@@ -2,23 +2,27 @@
 #
 # 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
 # default program.
 #
 
-BIN=./barrier/barrier
+# Get the directory in which this script is located
+BINDIR="${0%/*}"
 
-export LD_LIBRARY_PATH=..
+BIN=${BINDIR}/barrier/barrier
+PREFIX=
 
-[ $# -gt 0 ] && [ "$1" != "gdb" ] && BIN=$1 && shift
+export LD_LIBRARY_PATH=${BINDIR}/..
+# For Mac OSX
+export DYLD_LIBRARY_PATH=${BINDIR}/..
 
-if [ $# -gt 0 ] && [ "$1" = "gdb" ]; then
-	shift
-	gdb $BIN $@
-fi
+[ $# -gt 0 ] && [ "$1" = "gdb" ] && PREFIX=gdb && shift
+[ $# -gt 0 ] && [ -e "$1" ] && BIN="$1" && shift
 
-$BIN $@
+set -xe
+$PREFIX $BIN $@