From 37c8491dc37ee2ec4447ca9113167bfb4902807c Mon Sep 17 00:00:00 2001
From: Martin Michelsen <fuzziqersoftware+g@gmail.com>
Date: Sun, 22 Jan 2023 15:32:46 -0800
Subject: [PATCH] fix test-compression paths for github actions env

---
 CMakeLists.txt      |  2 +-
 test-compression.sh | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97889552..6954aa05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@ endforeach()
 add_test(
     NAME compression
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ${CMAKE_SOURCE_DIR}/test-compression.sh)
+    COMMAND ${CMAKE_SOURCE_DIR}/test-compression.sh ${CMAKE_BINARY_DIR}/newserv)
 
 
 
diff --git a/test-compression.sh b/test-compression.sh
index d152b7bc..71b0522e 100755
--- a/test-compression.sh
+++ b/test-compression.sh
@@ -2,24 +2,27 @@
 
 set -e
 
-make
+EXECUTABLE="$1"
+if [ "$EXECUTABLE" == "" ]; then
+  EXECUTABLE="./newserv"
+fi
 
 echo "... decompress card definitions"
-./newserv decompress-prs system/ep3/card-definitions.mnr card-defs.mnrd
+$EXECUTABLE decompress-prs system/ep3/card-definitions.mnr card-defs.mnrd
 echo "... compress card definitions"
-./newserv compress-prs card-defs.mnrd card-defs.mnr
+$EXECUTABLE compress-prs card-defs.mnrd card-defs.mnr
 echo "... check compressed card definitions"
-./newserv decompress-prs card-defs.mnr - | diff card-defs.mnrd -
+$EXECUTABLE decompress-prs card-defs.mnr - | diff card-defs.mnrd -
 
 echo "... recompress executable with PRS"
-./newserv compress-prs newserv newserv.prs
-./newserv decompress-prs newserv.prs
-diff newserv newserv.prs.dec
+$EXECUTABLE compress-prs $EXECUTABLE newserv.prs
+$EXECUTABLE decompress-prs newserv.prs
+diff $EXECUTABLE newserv.prs.dec
 
 echo "... recompress executable with BC0"
-./newserv compress-bc0 newserv newserv.bc0
-./newserv decompress-bc0 newserv.bc0
-diff newserv newserv.bc0.dec
+$EXECUTABLE compress-bc0 $EXECUTABLE newserv.bc0
+$EXECUTABLE decompress-bc0 newserv.bc0
+diff $EXECUTABLE newserv.bc0.dec
 
 echo "... clean up"
 rm card-defs.mnrd card-defs.mnr newserv.prs newserv.prs.dec newserv.bc0 newserv.bc0.dec