X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=run%2Ftests;h=4fe7a3d05ef06678aee3b57763d4e04411de6047;hb=3a546df5dacafb99958d53c9738e135d4f0deb2b;hp=5113b3afab3cfadafe969698823b2981bfc2d96d;hpb=09e16aa3acf7878b54a4995a0be79890f26db09f;p=libdcp.git

diff --git a/run/tests b/run/tests
index 5113b3af..4fe7a3d0 100755
--- a/run/tests
+++ b/run/tests
@@ -31,7 +31,7 @@ if [ "$?" != "0" ]; then
 fi
 
 # Check the first DCP written by the unit tests
-diff -ur test/ref/DCP/foo $work/DCP/foo
+diff -ur test/ref/DCP/dcp_test1 $work/DCP/dcp_test1
 if [ "$?" != "0" ]; then
     echo "FAIL: files differ"
     exit 1
@@ -53,7 +53,7 @@ fi
 
 # Run dcpinfo on all the DCPs in private/metadata, writing $work/info.log
 rm -f $work/info.log
-for d in `find $private/metadata -mindepth 1 -maxdepth 1 -type d | sort`; do
+for d in `find $private/metadata -mindepth 1 -maxdepth 1 -type d | sort -f -d`; do
     if [ `basename $d` != ".git" ]; then
         $dcpinfo --ignore-missing-assets -k -s $d 2> /dev/null >> $work/info.log
         if [ "$?" != "0" ]; then
@@ -76,7 +76,7 @@ rm -f $work/info2.log
 rm -rf $work/private
 mkdir $work/private
 cp -r $private/* $work/private
-for d in `find $work/private/metadata -mindepth 1 -maxdepth 1 -type d | sort`; do
+for d in `find $work/private/metadata -mindepth 1 -maxdepth 1 -type d | sort -f -d`; do
     if [ `basename $d` != ".git" ]; then
         $work/rewrite_subs $d
         $dcpinfo --ignore-missing-assets -k -s $d >> $work/info2.log
@@ -87,7 +87,7 @@ done
 sed -i "s/DCP: build\/test/DCP: test/g" $work/info2.log
 
 # And check it
-diff -q $work/info2.log $private/info.log
+diff -q $work/info2.log $private/info2.log
 if [ "$?" != "0" ]; then
     echo "FAIL: dcpinfo output from rewrite incorrect"
     exit 1