X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=run.sh;h=0807b2ec4a4557a05691c0f6a3315571f4b2681b;hp=7ef8e9bcf00193c1e44c9243bec39cefd754d25b;hb=7d107019dd0d32d0803fb802fc318a57101707a1;hpb=c77d1d922ed975933eab0b527c2c2e2951b64174

diff --git a/run.sh b/run.sh
index 7ef8e9bc..0807b2ec 100755
--- a/run.sh
+++ b/run.sh
@@ -1,13 +1,28 @@
 #!/bin/sh
-export LD_LIBRARY_PATH=.
-
-if [ $# -gt 0 ]; then
-	if [ "$1" = "gdb" ]; then
-		gdb ./model
-	else
-		echo "Invalid argument(s)"
-		exit 1
-	fi
-else
-	./model
-fi
+#
+# Runs a simple test (default: ./test/userprog.o)
+# Syntax:
+#  ./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.
+#
+
+# Get the directory in which this script and the binaries are located
+BINDIR="${0%/*}"
+
+BIN=${BINDIR}/test/userprog.o
+PREFIX=
+
+export LD_LIBRARY_PATH=${BINDIR}
+# For Mac OSX
+export DYLD_LIBRARY_PATH=${BINDIR}
+
+[ $# -gt 0 ] && [ "$1" = "gdb" ] && PREFIX=gdb && shift
+[ $# -gt 0 ] && [ -e "$1" ] && BIN="$1" && shift
+
+set -xe
+$PREFIX $BIN $@