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
# 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
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
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