Merge master.

3 files changed, 18 insertions, 3 deletions

diff --git a/run/dvdomatic-osx b/run/dvdomatic-osx
new file mode 100755
index 000000000..8fef27fec
--- /dev/null
+++ b/run/dvdomatic-osx
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:build/src/lib:build/src:/Users/carl/Environments/osx/64/lib
+if [ "$1" == "--debug" ]; then
+    shift
+    gdb --args build/src/tools/dvdomatic "$*"
+elif [ "$1" == "--valgrind" ]; then
+    shift
+    valgrind --tool="memcheck" build/src/tools/dvdomatic $*
+elif [ "$1" == "--i18n" ]; then
+    shift
+    LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 build/src/tools/dvdomatic "$*"
+else
+    build/src/tools/dvdomatic "$*"
+fi
diff --git a/run/makedcp-osx b/run/makedcp-osx
index 1b95ecc5d..03756f524 100755
--- a/run/makedcp-osx
+++ b/run/makedcp-osx
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:build/src/lib:build/src:/Users/carl/Environments/osx/10.8/lib
+export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:build/src/lib:build/src:/Users/carl/Environments/osx/64/lib
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/makedcp "$@"
diff --git a/run/tests b/run/tests
index e1686a55c..e6cdf4ba8 100755
--- a/run/tests
+++ b/run/tests
@@ -2,10 +2,10 @@
 
 export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH
 if [ "$1" == "--debug" ]; then
-    gdb --args build/test/unit-tests
+    gdb --args build/test/unit-tests --catch_system_errors=no
 elif [ "$1" == "--valgrind" ]; then
     valgrind --tool="memcheck" --leak-check=full build/test/unit-tests
 else
-    build/test/unit-tests
+    build/test/unit-tests --catch_system_errors=no
 fi