Selaa lähdekoodia

build(vhs): handle arbitrary NAMES

Signed-off-by: Christina Sørensen <christina@cafkafk.com>
Christina Sørensen 2 vuotta sitten
vanhempi
sitoutus
3a6b3eb6c4
1 muutettua tiedostoa jossa 14 lisäystä ja 7 poistoa
  1. 14 7
      tests/vhs-runner.sh

+ 14 - 7
tests/vhs-runner.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env fish
 
 set TEST_DIR tests
-set TAPES "$TEST_DIR/tapes"
-set REFERENCES "$TEST_DIR\/references"
-set TEMP "$TEST_DIR\/tmp"
+set TAPES $TEST_DIR/tapes
+set REFERENCES $TEST_DIR/references
+set TEMP $TEST_DIR/tmp
 
 function run_test -d "Run VHS test" -a NAME
 
@@ -14,7 +14,11 @@ function run_test -d "Run VHS test" -a NAME
 
     echo "[*] Testing $NAME..."
 
-    cat $TAPES/$NAME_TAPE | sed "s/outfile/$TEMP\/$NAME.txt/" | sed s/-l// | vhs
+    set GEN_DIR $TEMP
+    set GEN_FILE $GEN_DIR/$NAME.txt
+    set GEN_FILE_ESCAPE (echo $GEN_FILE | sed "s/\//\\\\\//g")
+
+    cat $TAPES/$NAME_TAPE | sed s/outfile/$GEN_FILE_ESCAPE/ | sed s/-l// | vhs >/dev/null
     # diff -q validated.ascii validated.txt && echo $SUCCESS || echo $FAILURE
     cmp -s -- $REFERENCES/$NAME.txt $TEMP/$NAME.txt && echo $SUCCESS || echo $FAILURE
 end
@@ -27,11 +31,14 @@ function gen_test -d "Generate VHS test" -a NAME
 
     echo "[*] Generating $NAME..."
 
-    cat $TAPES/$NAME_TAPE | sed "s/outfile/$REFERENCES\/$NAME.txt/" | sed s/-l// | vhs
+    set GEN_DIR $REFERENCES
+    set GEN_FILE $GEN_DIR/$NAME.txt
+    set GEN_FILE_ESCAPE (echo $GEN_FILE | sed "s/\//\\\\\//g")
+
+    cat $TAPES/$NAME_TAPE | sed s/outfile/$GEN_FILE_ESCAPE/ | sed s/-l// | vhs >/dev/null
     # diff -q validated.ascii validated.txt && echo $SUCCESS || echo $FAILURE
     cmp -s -- $REFERENCES/$NAME.txt $TEMP/$NAME.txt && echo $SUCCESS || echo $FAILURE
 end
 
-
-gen_test main
+# gen_test main
 run_test main