Handle multiple compressed files per original in the test.

Add some more test cases that decompress to the empty
file or a one byte long file. These test cases have
examples for the updated stream header and meta-block
header formats.

28 files changed, 21 insertions, 22 deletions

diff --git a/tests/compatibility_test.sh b/tests/compatibility_test.sh
index cf72662..e907485 100755
--- a/tests/compatibility_test.sh
+++ b/tests/compatibility_test.sh
@@ -6,34 +6,16 @@
 set -o errexit
 
 BRO=../tools/bro
-INPUTS="""
-testdata/empty.compressed
-testdata/x.compressed
-testdata/64x.compressed
-testdata/10x10y.compressed
-testdata/xyzzy.compressed
-testdata/quickfox.compressed
-testdata/ukkonooa.compressed
-testdata/monkey.compressed
-testdata/backward65536.compressed
-testdata/zeros.compressed
-testdata/quickfox_repeated.compressed
-testdata/compressed_file.compressed
-testdata/compressed_repeated.compressed
-testdata/alice29.txt.compressed
-testdata/asyoulik.txt.compressed
-testdata/lcet10.txt.compressed
-testdata/plrabn12.txt.compressed
-"""
 
-for file in $INPUTS; do
+for file in testdata/*.compressed*; do
   echo "Testing decompression of file $file"
-  uncompressed=${file%.compressed}.uncompressed
-  expected=${file%.compressed}
+  expected=${file%.compressed*}
+  uncompressed=${expected}.uncompressed
   $BRO -f -d -i $file -o $uncompressed
   diff -q $uncompressed $expected
   # Test the streaming version
   cat $file | $BRO -d > $uncompressed
   diff -q $uncompressed $expected
+  rm -f $uncompressed
 done
 
diff --git a/tests/testdata/empty.compressed.00 b/tests/testdata/empty.compressed.00
new file mode 100644
index 0000000..f8fa5a2
--- /dev/null
+++ b/tests/testdata/empty.compressed.00
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.01 b/tests/testdata/empty.compressed.01
new file mode 100644
index 0000000..17bb347
--- /dev/null
+++ b/tests/testdata/empty.compressed.01
@@ -0,0 +1 @@
+�

\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.02 b/tests/testdata/empty.compressed.02
new file mode 100644
index 0000000..c183df6
--- /dev/null
+++ b/tests/testdata/empty.compressed.02
@@ -0,0 +1 @@
+�

\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.03 b/tests/testdata/empty.compressed.03
new file mode 100644
index 0000000..ae60db8
--- /dev/null
+++ b/tests/testdata/empty.compressed.03
@@ -0,0 +1 @@
+�

\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.04 b/tests/testdata/empty.compressed.04
new file mode 100644
index 0000000..8fac034
--- /dev/null
+++ b/tests/testdata/empty.compressed.04
@@ -0,0 +1 @@
+�

\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.05 b/tests/testdata/empty.compressed.05
new file mode 100644
index 0000000..98c9dcc
--- /dev/null
+++ b/tests/testdata/empty.compressed.05
@@ -0,0 +1 @@
+�

\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.06 b/tests/testdata/empty.compressed.06
new file mode 100644
index 0000000..84f606f
--- /dev/null
+++ b/tests/testdata/empty.compressed.06
@@ -0,0 +1 @@
+�

\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.07 b/tests/testdata/empty.compressed.07
new file mode 100644
index 0000000..0941d53
--- /dev/null
+++ b/tests/testdata/empty.compressed.07
@@ -0,0 +1 @@
+�

\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.08 b/tests/testdata/empty.compressed.08
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/tests/testdata/empty.compressed.08
@@ -0,0 +1 @@
+3
\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.09 b/tests/testdata/empty.compressed.09
new file mode 100644
index 0000000..7813681
--- /dev/null
+++ b/tests/testdata/empty.compressed.09
@@ -0,0 +1 @@
+5
\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.10 b/tests/testdata/empty.compressed.10
new file mode 100644
index 0000000..c793025
--- /dev/null
+++ b/tests/testdata/empty.compressed.10
@@ -0,0 +1 @@
+7
\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.11 b/tests/testdata/empty.compressed.11
new file mode 100644
index 0000000..f11c82a
--- /dev/null
+++ b/tests/testdata/empty.compressed.11
@@ -0,0 +1 @@
+9
\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.12 b/tests/testdata/empty.compressed.12
new file mode 100644
index 0000000..1c8a0e7
--- /dev/null
+++ b/tests/testdata/empty.compressed.12
@@ -0,0 +1 @@
+;
\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.13 b/tests/testdata/empty.compressed.13
new file mode 100644
index 0000000..851c75c
--- /dev/null
+++ b/tests/testdata/empty.compressed.13
@@ -0,0 +1 @@
+=
\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.14 b/tests/testdata/empty.compressed.14
new file mode 100644
index 0000000..0d758c9
--- /dev/null
+++ b/tests/testdata/empty.compressed.14
@@ -0,0 +1 @@
+?
\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.15 b/tests/testdata/empty.compressed.15
new file mode 100644
index 0000000..152f9ed
--- /dev/null
+++ b/tests/testdata/empty.compressed.15
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.16 b/tests/testdata/empty.compressed.16
new file mode 100644
index 0000000..e136a79
--- /dev/null
+++ b/tests/testdata/empty.compressed.16
diff --git a/tests/testdata/empty.compressed.17 b/tests/testdata/empty.compressed.17
new file mode 100644
index 0000000..81f0388
--- /dev/null
+++ b/tests/testdata/empty.compressed.17
@@ -0,0 +1 @@
+

\ No newline at end of file
diff --git a/tests/testdata/empty.compressed.18 b/tests/testdata/empty.compressed.18
new file mode 100644
index 0000000..524e341
--- /dev/null
+++ b/tests/testdata/empty.compressed.18
diff --git a/tests/testdata/mapsdatazrh b/tests/testdata/mapsdatazrh
new file mode 100644
index 0000000..0371183
--- /dev/null
+++ b/tests/testdata/mapsdatazrh
diff --git a/tests/testdata/mapsdatazrh.compressed b/tests/testdata/mapsdatazrh.compressed
new file mode 100644
index 0000000..77bfa47
--- /dev/null
+++ b/tests/testdata/mapsdatazrh.compressed
diff --git a/tests/testdata/random_org_10k.bin b/tests/testdata/random_org_10k.bin
new file mode 100644
index 0000000..faf8a3a
--- /dev/null
+++ b/tests/testdata/random_org_10k.bin
diff --git a/tests/testdata/random_org_10k.bin.compressed b/tests/testdata/random_org_10k.bin.compressed
new file mode 100644
index 0000000..5ffbaa0
--- /dev/null
+++ b/tests/testdata/random_org_10k.bin.compressed
diff --git a/tests/testdata/x.compressed.00 b/tests/testdata/x.compressed.00
new file mode 100644
index 0000000..33e3a98
--- /dev/null
+++ b/tests/testdata/x.compressed.00
diff --git a/tests/testdata/x.compressed.01 b/tests/testdata/x.compressed.01
new file mode 100644
index 0000000..9c8249b
--- /dev/null
+++ b/tests/testdata/x.compressed.01
diff --git a/tests/testdata/x.compressed.02 b/tests/testdata/x.compressed.02
new file mode 100644
index 0000000..3a5890d
--- /dev/null
+++ b/tests/testdata/x.compressed.02
diff --git a/tests/testdata/x.compressed.03 b/tests/testdata/x.compressed.03
new file mode 100644
index 0000000..842e799
--- /dev/null
+++ b/tests/testdata/x.compressed.03