From c002c692082cd964b18733c8c19bcf0c6ded9d2c Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Thu, 12 Dec 2019 14:42:23 -0500 Subject: [PATCH] Include tools/tests/shell/test.cfs in repo The order in which cfspack includes its file depend on the platform. To have tests that reliably pass, test.cfs has to be committed in. --- tools/tests/Makefile | 8 ++++++++ tools/tests/shell/.gitignore | 1 - tools/tests/shell/runtests.sh | 2 -- tools/tests/shell/test.cfs | Bin 0 -> 544 bytes 4 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 tools/tests/shell/.gitignore create mode 100644 tools/tests/shell/test.cfs diff --git a/tools/tests/Makefile b/tools/tests/Makefile index e44faa9..941ce75 100644 --- a/tools/tests/Makefile +++ b/tools/tests/Makefile @@ -1,4 +1,5 @@ EMULDIR = ../emul +CFSPACK = ../cfspack/cfspack .PHONY: run run: @@ -6,3 +7,10 @@ run: cd unit && ./runtests.sh cd zasm && ./runtests.sh cd shell && ./runtests.sh + +$(CFSPACK): + $(MAKE) -C ../cfspack + +.PHONY: cfs +cfs: $(CFSPACK) + $(CFSPACK) shell/cfsin > shell/test.cfs diff --git a/tools/tests/shell/.gitignore b/tools/tests/shell/.gitignore deleted file mode 100644 index c58b0ca..0000000 --- a/tools/tests/shell/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/test.cfs diff --git a/tools/tests/shell/runtests.sh b/tools/tests/shell/runtests.sh index c583734..0972641 100755 --- a/tools/tests/shell/runtests.sh +++ b/tools/tests/shell/runtests.sh @@ -17,8 +17,6 @@ replay() { fi } -../../cfspack/cfspack cfsin > test.cfs - if [ ! -z $1 ]; then replay $1 exit 0 diff --git a/tools/tests/shell/test.cfs b/tools/tests/shell/test.cfs new file mode 100644 index 0000000000000000000000000000000000000000..f9fb1b69681ddcf96aa61a9b7c521dc9e8c66170 GIT binary patch literal 544 zcmZ>E3ufeINJ=bXzz#f8b8_+(oDz!^xv(o3;-b!A|EJ~W|8DvD!`J^fd=3!? E0Ox88-2eap literal 0 HcmV?d00001