Fix issues with CI

 * Fix a few paths and such in github actions script
 * Move file substitution lines in tests from Makefile to dedicated bash
   script - for some reason they were not working in my container.
   Possibly Make v4.3 does not support command substitutions while v4.4
   (on my local computer) does?

.github/workflows/.test.yml

@@ -25,7 +25,8 @@ jobs:
       - name: Set up C++ environment
         run: |
           # clone the morloc C++ headers for shared type definitions
-          git clone https://github.com/morloclib/mlccpptypes $HOME/.morloc/mlccpptypes
+          mkdir -p $HOME/.morloc/include
+          git clone https://github.com/morloclib/mlccpptypes $HOME/.morloc/include/mlccpptypes
 
       - uses: r-lib/actions/setup-r@v2
 

test-suite/golden-tests/file-input-c/.gitignore

@@ -1,2 +1,2 @@
-a.txt
-b.txt
+a.json
+b.json

test-suite/golden-tests/file-input-c/Makefile

@@ -1,17 +1,7 @@
 all:
 	rm -f obs.txt
 	morloc make -v foo.loc > log
-	echo '"a"' > a.json
-	echo '"b"' > b.json
-	>obs.txt
-	./nexus.py foo a.json b.json >> obs.txt
-	./nexus.py foo '"a"' b.json >> obs.txt
-	./nexus.py foo '"a"' '"b"' >> obs.txt
-	./nexus.py foo '"a"' <(echo '"b"') >> obs.txt
-	echo '"b"' | ./nexus.py foo '"a"' /dev/stdin >> obs.txt
-
-build:
-	g++ --std=c++17 -o pool-cpp.out pool.cpp -I/home/z/.morloc/include -I.
+	bash run.sh > obs.txt
 
 clean:
-	rm -rf nexus* pool* __pycache__ a.json b.json
+	rm -rf nexus* pool* a.json b.json

test-suite/golden-tests/file-input-c/run.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+echo '"a"' > a.json
+echo '"b"' > b.json
+./nexus.py foo a.json b.json
+./nexus.py foo '"a"' b.json
+./nexus.py foo '"a"' '"b"'
+./nexus.py foo '"a"' <(echo '"b"')
+echo '"b"' | ./nexus.py foo '"a"' /dev/stdin

test-suite/golden-tests/file-input-py/.gitignore

@@ -1,2 +1,2 @@
-a.txt
-b.txt
+a.json
+b.json

test-suite/golden-tests/file-input-py/Makefile

@@ -1,14 +1,7 @@
 all:
 	rm -f obs.txt
 	morloc make -v foo.loc > log
-	echo '"a"' > a.json
-	echo '"b"' > b.json
-	>obs.txt
-	./nexus.py foo a.json b.json >> obs.txt
-	./nexus.py foo '"a"' b.json >> obs.txt
-	./nexus.py foo '"a"' '"b"' >> obs.txt
-	./nexus.py foo '"a"' <(echo '"b"') >> obs.txt
-	echo '"b"' | ./nexus.py foo '"a"' /dev/stdin >> obs.txt
+	bash run.sh > obs.txt
 
 clean:
 	rm -rf nexus* pool* __pycache__ a.json b.json

test-suite/golden-tests/file-input-py/run.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+echo '"a"' > a.json
+echo '"b"' > b.json
+./nexus.py foo a.json b.json
+./nexus.py foo '"a"' b.json
+./nexus.py foo '"a"' '"b"'
+./nexus.py foo '"a"' <(echo '"b"')
+echo '"b"' | ./nexus.py foo '"a"' /dev/stdin

test-suite/golden-tests/file-input-r/.gitignore

@@ -1,2 +1,2 @@
-a.txt
-b.txt
+a.json
+b.json

test-suite/golden-tests/file-input-r/Makefile

@@ -1,14 +1,7 @@
 all:
 	rm -f obs.txt
 	morloc make -v foo.loc > log
-	echo '"a"' > a.json
-	echo '"b"' > b.json
-	>obs.txt
-	./nexus.py foo a.json b.json >> obs.txt
-	./nexus.py foo '"a"' b.json >> obs.txt
-	./nexus.py foo '"a"' '"b"' >> obs.txt
-	./nexus.py foo '"a"' <(echo '"b"') >> obs.txt
-	echo '"b"' | ./nexus.py foo '"a"' /dev/stdin >> obs.txt
+	bash run.sh > obs.txt
 
 clean:
 	rm -rf nexus* pool* a.json b.json

test-suite/golden-tests/file-input-r/run.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+echo '"a"' > a.json
+echo '"b"' > b.json
+./nexus.py foo a.json b.json
+./nexus.py foo '"a"' b.json
+./nexus.py foo '"a"' '"b"'
+./nexus.py foo '"a"' <(echo '"b"')
+echo '"b"' | ./nexus.py foo '"a"' /dev/stdin