X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=run.sh;h=0807b2ec4a4557a05691c0f6a3315571f4b2681b;hp=d4bf03000c92d6ab01f39b0e4cd14a17643f091f;hb=7742256df627848c1c375f979f5369a45c92057b;hpb=abcd7af73c22ea2e375bd14cd0cd101c7ece1bbc

diff --git a/run.sh b/run.sh
index d4bf0300..0807b2ec 100755
--- a/run.sh
+++ b/run.sh
@@ -2,23 +2,27 @@
 #
 # Runs a simple test (default: ./test/userprog.o)
 # 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=./test/userprog.o
+# Get the directory in which this script and the binaries are located
+BINDIR="${0%/*}"
 
-export LD_LIBRARY_PATH=.
+BIN=${BINDIR}/test/userprog.o
+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 $@