X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=run.sh;h=0807b2ec4a4557a05691c0f6a3315571f4b2681b;hp=00ffd94b338c223710f15198e06f1fd40ca25509;hb=25d73096cfc14c655f94b01bb235cc5efd1d5696;hpb=dc83c88bb4917edbc9ad07f1ab942172fab72a72

diff --git a/run.sh b/run.sh
index 00ffd94b..0807b2ec 100755
--- a/run.sh
+++ b/run.sh
@@ -11,13 +11,18 @@
 # default program.
 #
 
-BIN=./test/userprog.o
+# Get the directory in which this script and the binaries are located
+BINDIR="${0%/*}"
+
+BIN=${BINDIR}/test/userprog.o
 PREFIX=
 
-export LD_LIBRARY_PATH=.
+export LD_LIBRARY_PATH=${BINDIR}
+# For Mac OSX
+export DYLD_LIBRARY_PATH=${BINDIR}
 
 [ $# -gt 0 ] && [ "$1" = "gdb" ] && PREFIX=gdb && shift
-[ $# -gt 0 ] && [ -x "$1" ] && [ -f "$1" ] && BIN="$1" && shift
+[ $# -gt 0 ] && [ -e "$1" ] && BIN="$1" && shift
 
-set -x
+set -xe
 $PREFIX $BIN $@