Change initialize a bit
[c11tester.git] / run.sh
diff --git a/run.sh b/run.sh
index 00ffd94..0807b2e 100755 (executable)
--- a/run.sh
+++ b/run.sh
 # 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 $@