test: use unique output file names across tests

Without the change tests ran in parallel occasionally clobber outputs of
one another and fail as:

    $ make check -j16 VERBOSE=y
    ...
    FAIL: huge
    ==========
    Converting
    File ../test/data/5.plist is open
    PList XML parsing succeeded
    PList BIN writing succeeded
    PList BIN parsing succeeded
    PList XML writing succeeded
    Size of input and output is different
    Input size : 4292380
    Output size : 4305301
    Comparing
    PList parsing failed
    FAIL huge.test (exit status: 3)

Closes: https://github.com/libimobiledevice/libplist/issues/234#issuecomment-1743820556

36 files changed, 68 insertions, 68 deletions

diff --git a/test/amp.test b/test/amp.test
index 76b32ff..3678f27 100755
--- a/test/amp.test
+++ b/test/amp.test
@@ -3,7 +3,7 @@
 DATASRC=$top_srcdir/test/data
 TESTFILE=amp.plist
 DATAIN0=$DATASRC/$TESTFILE
-DATAOUT0=$top_builddir/test/data/$TESTFILE.out
+DATAOUT0=$top_builddir/test/data/amp.test.out
 
 rm -rf $DATAOUT0
 $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
diff --git a/test/bigarray++.test b/test/bigarray++.test
index da65387..78f38ef 100755
--- a/test/bigarray++.test
+++ b/test/bigarray++.test
@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
 fi
 
 echo "Converting"
-$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/bigarray++.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/bigarray++.test.out
diff --git a/test/bigarray.test b/test/bigarray.test
index 4b819f4..1b88d43 100755
--- a/test/bigarray.test
+++ b/test/bigarray.test
@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
 fi
 
 echo "Converting"
-$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/bigarray.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/bigarray.test.out
diff --git a/test/cdata.test b/test/cdata.test
index 77e7e45..b4f3ed2 100755
--- a/test/cdata.test
+++ b/test/cdata.test
@@ -5,7 +5,7 @@ set -e
 DATASRC=$top_srcdir/test/data
 TESTFILE=cdata.plist
 DATAIN0=$DATASRC/$TESTFILE
-DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
+DATAOUT0=$top_builddir/test/data/cdata.test.bin
 
 $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
 
diff --git a/test/dates.test b/test/dates.test
index 2865717..06bf034 100755
--- a/test/dates.test
+++ b/test/dates.test
@@ -5,8 +5,8 @@ set -e
 DATASRC=$top_srcdir/test/data
 TESTFILE=7.plist
 DATAIN0=$DATASRC/$TESTFILE
-DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
-DATAOUT1=$top_builddir/test/data/$TESTFILE.xml
+DATAOUT0=$top_builddir/test/data/dates.test.bin
+DATAOUT1=$top_builddir/test/data/dates.test.xml
 
 $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
 $top_builddir/tools/plistutil -i $DATAOUT0 -o $DATAOUT1
diff --git a/test/empty++.test b/test/empty++.test
index f29e95e..7e3695b 100755
--- a/test/empty++.test
+++ b/test/empty++.test
@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
 fi
 
 echo "Converting"
-$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/empty++.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/empty++.test.out
diff --git a/test/empty.test b/test/empty.test
index 0a21f33..bc71562 100755
--- a/test/empty.test
+++ b/test/empty.test
@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
 fi
 
 echo "Converting"
-$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/empty.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/empty.test.out
diff --git a/test/empty_keys.test b/test/empty_keys.test
index 4291e8c..19bbb08 100755
--- a/test/empty_keys.test
+++ b/test/empty_keys.test
@@ -5,7 +5,7 @@ set -e
 DATASRC=$top_srcdir/test/data
 TESTFILE=empty_keys.plist
 DATAIN0=$DATASRC/$TESTFILE
-DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
+DATAOUT0=$top_builddir/test/data/empty_keys.test.bin
 
 $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
 
diff --git a/test/entities.test b/test/entities.test
index b87e4c7..a828e15 100755
--- a/test/entities.test
+++ b/test/entities.test
@@ -5,7 +5,7 @@ set -e
 DATASRC=$top_srcdir/test/data
 TESTFILE=entities.plist
 DATAIN0=$DATASRC/$TESTFILE
-DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
+DATAOUT0=$top_builddir/test/data/entities.test.bin
 
 $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
 
diff --git a/test/hex.test b/test/hex.test
index 99b88bc..414cdbc 100755
--- a/test/hex.test
+++ b/test/hex.test
@@ -5,7 +5,7 @@ set -e
 DATASRC=$top_srcdir/test/data
 TESTFILE=hex.plist
 DATAIN0=$DATASRC/$TESTFILE
-DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
+DATAOUT0=$top_builddir/test/data/hex.test.bin
 
 $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
 
diff --git a/test/huge++.test b/test/huge++.test
index 3b6425e..90d3503 100755
--- a/test/huge++.test
+++ b/test/huge++.test
@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
 fi
 
 echo "Converting"
-$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/huge++.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/huge++.test.out
diff --git a/test/huge.test b/test/huge.test
index 8585ed5..560c21f 100755
--- a/test/huge.test
+++ b/test/huge.test
@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
 fi
 
 echo "Converting"
-$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/huge.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/huge.test.out
diff --git a/test/invalid_tag.test b/test/invalid_tag.test
index 2c42a53..5d4da93 100755
--- a/test/invalid_tag.test
+++ b/test/invalid_tag.test
@@ -3,7 +3,7 @@
 DATASRC=$top_srcdir/test/data
 TESTFILE=invalid_tag.plist
 DATAIN0=$DATASRC/$TESTFILE
-DATAOUT0=$top_builddir/test/data/$TESTFILE.out
+DATAOUT0=$top_builddir/test/data/invalid_tag.test.out
 
 rm -rf $DATAOUT0
 $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
diff --git a/test/json-int64-min-max.test b/test/json-int64-min-max.test
index f6ed731..f3fe61c 100755
--- a/test/json-int64-min-max.test
+++ b/test/json-int64-min-max.test
@@ -13,7 +13,7 @@ fi
 export PLIST_JSON_DEBUG=1
 
 echo "Converting"
-$top_builddir/test/plist_jtest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_jtest $DATASRC/$TESTFILE $DATAOUT/json-int64-min-max.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/json-int64-min-max.test.out
diff --git a/test/json1.test b/test/json1.test
index 9828ba7..cc7440f 100755
--- a/test/json1.test
+++ b/test/json1.test
@@ -13,7 +13,7 @@ fi
 export PLIST_JSON_DEBUG=1
 
 echo "Converting"
-$top_builddir/test/plist_jtest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_jtest $DATASRC/$TESTFILE $DATAOUT/json1.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/json1.test.out
diff --git a/test/json2.test b/test/json2.test
index a289f5e..199643c 100755
--- a/test/json2.test
+++ b/test/json2.test
@@ -13,7 +13,7 @@ fi
 export PLIST_JSON_DEBUG=1
 
 echo "Converting"
-$top_builddir/test/plist_jtest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_jtest $DATASRC/$TESTFILE $DATAOUT/json2.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/json2.test.out
diff --git a/test/json3.test b/test/json3.test
index aa040e5..6189e89 100755
--- a/test/json3.test
+++ b/test/json3.test
@@ -13,12 +13,12 @@ fi
 export PLIST_JSON_DEBUG=1
 
 echo "Converting input file to JSON"
-$top_builddir/tools/plistutil -f json -i $DATASRC/$TESTFILE -o $DATAOUT/$TESTFILE.json
+$top_builddir/tools/plistutil -f json -i $DATASRC/$TESTFILE -o $DATAOUT/json3.test.json
 
 echo "Converting to binary and back to JSON"
-$top_builddir/test/plist_jtest $DATAOUT/$TESTFILE.json $DATAOUT/$TESTFILE.json.out
+$top_builddir/test/plist_jtest $DATAOUT/json3.test.json $DATAOUT/json3.test.json.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.json.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/json3.test.json.out
 
-rm -f $DATAOUT/$TESTFILE.json
+rm -f $DATAOUT/json3.test.json
diff --git a/test/large++.test b/test/large++.test
index cdadd75..f3f4c23 100755
--- a/test/large++.test
+++ b/test/large++.test
@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
 fi
 
 echo "Converting"
-$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/large++.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/large++.test.out
diff --git a/test/large.test b/test/large.test
index b46743f..d3cce7a 100755
--- a/test/large.test
+++ b/test/large.test
@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
 fi
 
 echo "Converting"
-$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/large.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/large.test.out
diff --git a/test/malformed_dict.test b/test/malformed_dict.test
index cbad2bd..1d3ba2b 100755
--- a/test/malformed_dict.test
+++ b/test/malformed_dict.test
@@ -3,7 +3,7 @@
 DATASRC=$top_srcdir/test/data
 TESTFILE=malformed_dict.bplist
 DATAIN0=$DATASRC/$TESTFILE
-DATAOUT0=$top_builddir/test/data/$TESTFILE.out
+DATAOUT0=$top_builddir/test/data/malformed_dict.test.out
 
 $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
 
diff --git a/test/medium++.test b/test/medium++.test
index 3488dfd..6eb453f 100755
--- a/test/medium++.test
+++ b/test/medium++.test
@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
 fi
 
 echo "Converting"
-$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/medium++.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/medium++.test.out
diff --git a/test/medium.test b/test/medium.test
index 39213b4..300c016 100755
--- a/test/medium.test
+++ b/test/medium.test
@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
 fi
 
 echo "Converting"
-$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/medium.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/medium.test.out
diff --git a/test/order.test b/test/order.test
index f8a7702..bd89b9d 100755
--- a/test/order.test
+++ b/test/order.test
@@ -6,7 +6,7 @@ DATASRC=$top_srcdir/test/data
 TESTFILE=order.bplist
 DATAIN0=$DATASRC/$TESTFILE
 DATAIN1=$DATASRC/order.plist
-DATAOUT0=$top_builddir/test/data/$TESTFILE.out
+DATAOUT0=$top_builddir/test/data/order.test.out
 
 $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
 
diff --git a/test/ostep-comments.test b/test/ostep-comments.test
index 8f7f629..68f5242 100755
--- a/test/ostep-comments.test
+++ b/test/ostep-comments.test
@@ -13,8 +13,8 @@ fi
 export PLIST_OSTEP_DEBUG=1
 
 echo "Converting"
-$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/ostep-comments.test.out
 
 echo "Comparing"
 export PLIST_OSTEP_DEBUG=1
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/ostep-comments.test.out
diff --git a/test/ostep-strings.test b/test/ostep-strings.test
index 5b0a098..e3441a3 100755
--- a/test/ostep-strings.test
+++ b/test/ostep-strings.test
@@ -13,8 +13,8 @@ fi
 export PLIST_OSTEP_DEBUG=1
 
 echo "Converting"
-$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/ostep-strings.test.out
 
 echo "Comparing"
 export PLIST_OSTEP_DEBUG=1
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/ostep-strings.test.out
diff --git a/test/ostep1.test b/test/ostep1.test
index f0d9b51..998fc54 100755
--- a/test/ostep1.test
+++ b/test/ostep1.test
@@ -13,8 +13,8 @@ fi
 export PLIST_OSTEP_DEBUG=1
 
 echo "Converting"
-$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/ostep1.test.out
 
 echo "Comparing"
 export PLIST_OSTEP_DEBUG=1
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/ostep1.test.out
diff --git a/test/ostep2.test b/test/ostep2.test
index 1b991c3..a5485f8 100755
--- a/test/ostep2.test
+++ b/test/ostep2.test
@@ -13,7 +13,7 @@ fi
 export PLIST_OTEST_DEBUG=1
 
 echo "Converting"
-$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/ostep2.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/ostep2.test.out
diff --git a/test/recursion.test b/test/recursion.test
index 9946d81..97bfb45 100755
--- a/test/recursion.test
+++ b/test/recursion.test
@@ -3,7 +3,7 @@
 DATASRC=$top_srcdir/test/data
 TESTFILE=recursion.bplist
 DATAIN0=$DATASRC/$TESTFILE
-DATAOUT0=$top_builddir/test/data/$TESTFILE.out
+DATAOUT0=$top_builddir/test/data/recursion.test.out
 
 $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
 
diff --git a/test/signedunsigned1.test b/test/signedunsigned1.test
index 798de86..52f7080 100755
--- a/test/signedunsigned1.test
+++ b/test/signedunsigned1.test
@@ -13,8 +13,8 @@ CMPFILE1=unsigned.bplist
 DATACMP0=$DATASRC/$CMPFILE0
 DATACMP1=$DATASRC/$CMPFILE1
 
-DATAOUT0=$top_builddir/test/data/$TESTFILE0.bin
-DATAOUT1=$top_builddir/test/data/$TESTFILE1.bin
+DATAOUT0=$top_builddir/test/data/signedunsigned1.test.signed.bin
+DATAOUT1=$top_builddir/test/data/signedunsigned1.test.unsigned.bin
 
 $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
 $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1
diff --git a/test/signedunsigned2.test b/test/signedunsigned2.test
index 2ea8b49..192f1a6 100755
--- a/test/signedunsigned2.test
+++ b/test/signedunsigned2.test
@@ -13,8 +13,8 @@ CMPFILE1=unsigned.plist
 DATACMP0=$DATASRC/$CMPFILE0
 DATACMP1=$DATASRC/$CMPFILE1
 
-DATAOUT0=$top_builddir/test/data/$TESTFILE0.bin
-DATAOUT1=$top_builddir/test/data/$TESTFILE1.bin
+DATAOUT0=$top_builddir/test/data/signedunsigned2.test.signed.bin
+DATAOUT1=$top_builddir/test/data/signedunsigned2.test.unsigned.bin
 
 $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
 $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1
diff --git a/test/signedunsigned3.test b/test/signedunsigned3.test
index d732e72..87bdcbc 100755
--- a/test/signedunsigned3.test
+++ b/test/signedunsigned3.test
@@ -13,8 +13,8 @@ CMPFILE1=signedunsigned.plist
 DATACMP0=$DATASRC/$CMPFILE0
 DATACMP1=$DATASRC/$CMPFILE1
 
-DATAOUT0=$top_builddir/test/data/$TESTFILE0.bin
-DATAOUT1=$top_builddir/test/data/$TESTFILE1.xml
+DATAOUT0=$top_builddir/test/data/signedunsigned3.test.signed.bin
+DATAOUT1=$top_builddir/test/data/signedunsigned3.test.unsigned.xml
 
 $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
 $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1
diff --git a/test/small++.test b/test/small++.test
index 28c7676..2ceace7 100755
--- a/test/small++.test
+++ b/test/small++.test
@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
 fi
 
 echo "Converting"
-$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/small++.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/small++.test.out
diff --git a/test/small.test b/test/small.test
index 8c25e70..dd2faf8 100755
--- a/test/small.test
+++ b/test/small.test
@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
 fi
 
 echo "Converting"
-$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/small.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/small.test.out
diff --git a/test/timezone1.test b/test/timezone1.test
index 843b166..5de7cea 100755
--- a/test/timezone1.test
+++ b/test/timezone1.test
@@ -5,9 +5,9 @@ set -e
 DATASRC=$top_srcdir/test/data
 TESTFILE=7.plist
 DATAIN0=$DATASRC/$TESTFILE
-DATAOUT0=$top_builddir/test/data/$TESTFILE.tz0.bin
-DATAOUT1=$top_builddir/test/data/$TESTFILE.tz1.bin
-DATAOUT2=$top_builddir/test/data/$TESTFILE.tz2.bin
+DATAOUT0=$top_builddir/test/data/timezone1.test.tz0.bin
+DATAOUT1=$top_builddir/test/data/timezone1.test.tz1.bin
+DATAOUT2=$top_builddir/test/data/timezone1.test.tz2.bin
 
 TZ=UTC $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
 TZ=Asia/Singapore $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT1
diff --git a/test/timezone2.test b/test/timezone2.test
index 57db720..79db523 100755
--- a/test/timezone2.test
+++ b/test/timezone2.test
@@ -5,10 +5,10 @@ set -e
 DATASRC=$top_srcdir/test/data
 TESTFILE=7.plist
 DATAIN0=$DATASRC/$TESTFILE
-DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
-DATAOUT1=$top_builddir/test/data/$TESTFILE.tz0.xml
-DATAOUT2=$top_builddir/test/data/$TESTFILE.tz1.xml
-DATAOUT3=$top_builddir/test/data/$TESTFILE.tz2.xml
+DATAOUT0=$top_builddir/test/data/timezone2.test.bin
+DATAOUT1=$top_builddir/test/data/timezone2.test.tz0.xml
+DATAOUT2=$top_builddir/test/data/timezone2.test.tz1.xml
+DATAOUT3=$top_builddir/test/data/timezone2.test.tz2.xml
 
 TZ=UTC $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
 
diff --git a/test/uid.test b/test/uid.test
index f131c6d..a62756f 100755
--- a/test/uid.test
+++ b/test/uid.test
@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
 fi
 
 echo "Converting"
-$top_builddir/test/plist_btest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_btest $DATASRC/$TESTFILE $DATAOUT/uid.test.out
 
 echo "Comparing"
-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
+$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/uid.test.out