split compression tests and skip executable recompression

CMakeLists.txt

@@ -124,10 +124,13 @@ foreach(TestCase IN ITEMS ${TestCases})
 endforeach()
 
 add_test(
-    NAME compression
+    NAME compression-prs
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ${CMAKE_SOURCE_DIR}/test-compression.sh ${CMAKE_BINARY_DIR}/newserv)
-
+    COMMAND ${CMAKE_SOURCE_DIR}/test-compression.sh prs ${CMAKE_BINARY_DIR}/newserv)
+add_test(
+    NAME compression-bc0
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    COMMAND ${CMAKE_SOURCE_DIR}/test-compression.sh bc0 ${CMAKE_BINARY_DIR}/newserv)
 
 
 # Installation configuration

test-compression.sh

@@ -2,7 +2,9 @@
 
 set -e
 
-EXECUTABLE="$1"
+SCHEME=$1
+
+EXECUTABLE="$2"
 if [ "$EXECUTABLE" == "" ]; then
   EXECUTABLE="./newserv"
 fi
@@ -10,19 +12,9 @@ fi
 echo "... decompress card definitions"
 $EXECUTABLE decompress-prs system/ep3/card-definitions.mnr card-defs.mnrd
 echo "... compress card definitions"
-$EXECUTABLE compress-prs card-defs.mnrd card-defs.mnr
+$EXECUTABLE compress-$SCHEME card-defs.mnrd card-defs.mnr.$SCHEME
 echo "... check compressed card definitions"
-$EXECUTABLE decompress-prs card-defs.mnr - | diff card-defs.mnrd -
-
-echo "... recompress executable with PRS"
-$EXECUTABLE compress-prs $EXECUTABLE newserv.prs
-$EXECUTABLE decompress-prs newserv.prs
-diff $EXECUTABLE newserv.prs.dec
-
-echo "... recompress executable with BC0"
-$EXECUTABLE compress-bc0 $EXECUTABLE newserv.bc0
-$EXECUTABLE decompress-bc0 newserv.bc0
-diff $EXECUTABLE newserv.bc0.dec
+$EXECUTABLE decompress-$SCHEME card-defs.mnr.$SCHEME - | diff card-defs.mnrd -
 
 echo "... clean up"
-rm card-defs.mnrd card-defs.mnr newserv.prs newserv.prs.dec newserv.bc0 newserv.bc0.dec
+rm card-defs.mnrd card-defs.mnr.$SCHEME