Remove submodule of test/private as submodules don't seem to work too well with git...

diff --git a/run/tests b/run/tests
index 1a028b67874c5650839f262417a17f2c89e3e851..30b8d2b4be1b93fcee113369d68a0f85edcc0e16 100755 (executable)
--- a/run/tests
+++ b/run/tests
@@ -22,8 +22,11 @@ else
     $work/tests $*
 fi
 
-if [ ! -e "test/private/info.log" ]; then
-    echo "Private data not found: some tests will not run"
+# Check a MXF written by the unit tests
+diff $work/baz/video1.mxf $work/baz/video2.mxf
+if [ "$?" != "0" ]; then
+    echo "FAIL: MXFs from recovery incorrect"
+    exit 1
 fi
 
 # Check the first DCP written by the unit tests
@@ -39,6 +42,13 @@ if [ "$?" != "0" ]; then
     echo "FAIL: files differ"
     exit 1
 fi
+    
+# Everything beyond this point needs $private to exist
+if [ ! -e "$private/info.log" ]; then
+    echo ""
+    echo "Private data not found: some tests will not run."
+    exit 1
+fi
 
 # Run dcpinfo on all the DCPs in private/metadata, writing $work/info.log
 rm -f $work/info.log
@@ -85,11 +95,4 @@ fi
 # and check that they are right
 build/tools/dcpinfo -s $private/JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV >> $work/jah.log
 
-# Check a MXF written by the unit tests
-diff $work/baz/video1.mxf $work/baz/video2.mxf
-if [ "$?" != "0" ]; then
-    echo "FAIL: MXFs from recovery incorrect"
-    exit 1
-fi
-    
 echo "PASS"

diff --git a/test/private b/test/private
deleted file mode 160000 (submodule)
index b1b5665..0000000
--- a/test/private
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b1b56652bd67e74817e02933412190b33d4823b6

diff --git a/test/test.cc b/test/test.cc
index c58966f490e6cbadf6e9b76d44e3786f31ec4b37..0f60e0f1a36219fee8ca88d143901845d9bfc1f7 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -46,5 +46,5 @@ wav (libdcp::Channel)
        return "test/data/1s_24-bit_48k_silence.wav";
 }
 
-string private_test = "test/private";
+string private_test = "../libdcp-test-private";