test: Merge *cmp.test into *.test to allow parallel testing

13 files changed, 24 insertions, 48 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 6a8a890..4519de0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,12 +16,6 @@ TESTS = \
 	large.test \
 	huge.test \
 	bigarray.test \
-	emptycmp.test \
-	smallcmp.test \
-	mediumcmp.test \
-	largecmp.test \
-	hugecmp.test \
-	bigarraycmp.test \
 	dates.test \
 	timezone1.test \
 	timezone2.test \
diff --git a/test/bigarray.test b/test/bigarray.test
index 27f8098..4b819f4 100755
--- a/test/bigarray.test
+++ b/test/bigarray.test
@@ -8,4 +8,8 @@ if ! test -d "$DATAOUT"; then
 	mkdir -p $DATAOUT
 fi
 
+echo "Converting"
 $top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+
+echo "Comparing"
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
diff --git a/test/bigarraycmp.test b/test/bigarraycmp.test
deleted file mode 100755
index 1c11336..0000000
--- a/test/bigarraycmp.test
+++ /dev/null
@@ -1,7 +0,0 @@
-## -*- sh -*-
-
-DATASRC=$top_srcdir/test/data
-DATAOUT=$top_builddir/test/data
-TESTFILE=6.plist
-
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
diff --git a/test/empty.test b/test/empty.test
index d092ee3..0a21f33 100755
--- a/test/empty.test
+++ b/test/empty.test
@@ -8,4 +8,8 @@ if ! test -d "$DATAOUT"; then
 	mkdir -p $DATAOUT
 fi
 
+echo "Converting"
 $top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+
+echo "Comparing"
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
diff --git a/test/emptycmp.test b/test/emptycmp.test
deleted file mode 100755
index 2496866..0000000
--- a/test/emptycmp.test
+++ /dev/null
@@ -1,7 +0,0 @@
-## -*- sh -*-
-
-DATASRC=$top_srcdir/test/data
-DATAOUT=$top_builddir/test/data
-TESTFILE=1.plist
-
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
diff --git a/test/huge.test b/test/huge.test
index f4ea9bf..8585ed5 100755
--- a/test/huge.test
+++ b/test/huge.test
@@ -8,4 +8,8 @@ if ! test -d "$DATAOUT"; then
 	mkdir -p $DATAOUT
 fi
 
+echo "Converting"
 $top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+
+echo "Comparing"
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
diff --git a/test/hugecmp.test b/test/hugecmp.test
deleted file mode 100755
index dfdff52..0000000
--- a/test/hugecmp.test
+++ /dev/null
@@ -1,7 +0,0 @@
-## -*- sh -*-
-
-DATASRC=$top_srcdir/test/data
-DATAOUT=$top_builddir/test/data
-TESTFILE=5.plist
-
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
diff --git a/test/large.test b/test/large.test
index dfe05d0..b46743f 100755
--- a/test/large.test
+++ b/test/large.test
@@ -8,4 +8,8 @@ if ! test -d "$DATAOUT"; then
 	mkdir -p $DATAOUT
 fi
 
+echo "Converting"
 $top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+
+echo "Comparing"
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
diff --git a/test/largecmp.test b/test/largecmp.test
deleted file mode 100755
index 922be36..0000000
--- a/test/largecmp.test
+++ /dev/null
@@ -1,7 +0,0 @@
-## -*- sh -*-
-
-DATASRC=$top_srcdir/test/data
-DATAOUT=$top_builddir/test/data
-TESTFILE=4.plist
-
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
diff --git a/test/medium.test b/test/medium.test
index 6740599..39213b4 100755
--- a/test/medium.test
+++ b/test/medium.test
@@ -8,4 +8,8 @@ if ! test -d "$DATAOUT"; then
 	mkdir -p $DATAOUT
 fi
 
+echo "Converting"
 $top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+
+echo "Comparing"
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
diff --git a/test/mediumcmp.test b/test/mediumcmp.test
deleted file mode 100755
index 9eff0da..0000000
--- a/test/mediumcmp.test
+++ /dev/null
@@ -1,7 +0,0 @@
-## -*- sh -*-
-
-DATASRC=$top_srcdir/test/data
-DATAOUT=$top_builddir/test/data
-TESTFILE=3.plist
-
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
diff --git a/test/small.test b/test/small.test
index d84782a..8c25e70 100755
--- a/test/small.test
+++ b/test/small.test
@@ -8,4 +8,8 @@ if ! test -d "$DATAOUT"; then
 	mkdir -p $DATAOUT
 fi
 
+echo "Converting"
 $top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+
+echo "Comparing"
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
diff --git a/test/smallcmp.test b/test/smallcmp.test
deleted file mode 100755
index 461a8e6..0000000
--- a/test/smallcmp.test
+++ /dev/null
@@ -1,7 +0,0 @@
-## -*- sh -*-
-
-DATASRC=$top_srcdir/test/data
-DATAOUT=$top_builddir/test/data
-TESTFILE=2.plist
-
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out