From 84d83825378ae0b81d40f94366aee261eb256be9 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 12 Apr 2021 06:30:41 -0700 Subject: tests: implicitly generate empty .expected files. Makefile (%.expected): New implicit rule. Whenever a test requires a .expected file, if it is missing, we create an empty one. This file will be treated as an intermediate by GNU Make, which means that it will be deleted when make terminates. * tests/012/compile.tl: Some of the .tl files no longer have an .expected file, so we have to test for that in the catenating logic. * tests/008/call-2.expected, * tests/008/no-stdin-hang.expected, * tests/011/macros-3.expected, * tests/011/patmatch.expected, * tests/012/aseq.expected, * tests/012/ashwin.expected, * tests/012/compile.tl, * tests/012/cont.expected, * tests/012/defset.expected, * tests/012/ifa.expected, * tests/012/oop-seq.expected, * tests/012/parse.expected, * tests/012/quasi.expected, * tests/012/quine.expected, * tests/012/seq.expected, * tests/012/struct.expected, * tests/012/stslot.expected, * tests/014/dgram-stream.expected, * tests/014/in6addr-str.expected, * tests/014/inaddr-str.expected, * tests/014/socket-basic.expected, * tests/015/awk-fconv.expected, * tests/015/split.expected, * tests/015/trim.expected, * tests/016/arith.expected, * tests/016/ud-arith.expected, * tests/017/ffi-misc.expected, * tests/018/chmod.expected: Empty file deleted. --- Makefile | 3 +++ tests/008/call-2.expected | 0 tests/008/no-stdin-hang.expected | 0 tests/011/macros-3.expected | 0 tests/011/patmatch.expected | 0 tests/012/aseq.expected | 0 tests/012/ashwin.expected | 0 tests/012/compile.tl | 6 ++++-- tests/012/cont.expected | 0 tests/012/defset.expected | 0 tests/012/ifa.expected | 0 tests/012/oop-seq.expected | 0 tests/012/parse.expected | 0 tests/012/quasi.expected | 0 tests/012/quine.expected | 0 tests/012/seq.expected | 0 tests/012/struct.expected | 0 tests/012/stslot.expected | 0 tests/014/dgram-stream.expected | 0 tests/014/in6addr-str.expected | 0 tests/014/inaddr-str.expected | 0 tests/014/socket-basic.expected | 0 tests/015/awk-fconv.expected | 0 tests/015/split.expected | 0 tests/015/trim.expected | 0 tests/016/arith.expected | 0 tests/016/ud-arith.expected | 0 tests/017/ffi-misc.expected | 0 tests/018/chmod.expected | 0 29 files changed, 7 insertions(+), 2 deletions(-) delete mode 100644 tests/008/call-2.expected delete mode 100644 tests/008/no-stdin-hang.expected delete mode 100644 tests/011/macros-3.expected delete mode 100644 tests/011/patmatch.expected delete mode 100644 tests/012/aseq.expected delete mode 100644 tests/012/ashwin.expected delete mode 100644 tests/012/cont.expected delete mode 100644 tests/012/defset.expected delete mode 100644 tests/012/ifa.expected delete mode 100644 tests/012/oop-seq.expected delete mode 100644 tests/012/parse.expected delete mode 100644 tests/012/quasi.expected delete mode 100644 tests/012/quine.expected delete mode 100644 tests/012/seq.expected delete mode 100644 tests/012/struct.expected delete mode 100644 tests/012/stslot.expected delete mode 100644 tests/014/dgram-stream.expected delete mode 100644 tests/014/in6addr-str.expected delete mode 100644 tests/014/inaddr-str.expected delete mode 100644 tests/014/socket-basic.expected delete mode 100644 tests/015/awk-fconv.expected delete mode 100644 tests/015/split.expected delete mode 100644 tests/015/trim.expected delete mode 100644 tests/016/arith.expected delete mode 100644 tests/016/ud-arith.expected delete mode 100644 tests/017/ffi-misc.expected delete mode 100644 tests/018/chmod.expected diff --git a/Makefile b/Makefile index fe007c88..f23f25c0 100644 --- a/Makefile +++ b/Makefile @@ -368,6 +368,9 @@ retest: $(V)rm -rf tst $(V)$(MAKE) tests +%.expected: + $(V)touch $@ + tst/tests/000/binding.ok: TXR_OPTS := -B tst/tests/001/%: TXR_ARGS := tests/001/data tst/tests/001/query-1.ok: TXR_OPTS := -B diff --git a/tests/008/call-2.expected b/tests/008/call-2.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/008/no-stdin-hang.expected b/tests/008/no-stdin-hang.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/011/macros-3.expected b/tests/011/macros-3.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/011/patmatch.expected b/tests/011/patmatch.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/012/aseq.expected b/tests/012/aseq.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/012/ashwin.expected b/tests/012/ashwin.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/012/compile.tl b/tests/012/compile.tl index 36a285d3..f5b260cf 100644 --- a/tests/012/compile.tl +++ b/tests/012/compile.tl @@ -6,7 +6,9 @@ (each ((f '#"aseq.tl ashwin.tl circ.tl cont.tl defset.tl except.tl \ fini.tl ifa.tl man-or-boy.tl oop-mi.tl oop-seq.tl oop.tl \ parse.tl quasi.tl quine.tl seq.tl stslot.tl")) - (file-append-string %expected-file% - (file-get-string `@{%this-dir%}/@(m^ #/.*[.]/ f)expected`)) + (let ((exf `@{%this-dir%}/@(m^ #/.*[.]/ f)expected`)) + (when (path-exists-p exf) + (file-append-string %expected-file% + (file-get-string exf)))) (compile-file f "temp.tlo") (remove-path "temp.tlo")) diff --git a/tests/012/cont.expected b/tests/012/cont.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/012/defset.expected b/tests/012/defset.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/012/ifa.expected b/tests/012/ifa.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/012/oop-seq.expected b/tests/012/oop-seq.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/012/parse.expected b/tests/012/parse.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/012/quasi.expected b/tests/012/quasi.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/012/quine.expected b/tests/012/quine.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/012/seq.expected b/tests/012/seq.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/012/struct.expected b/tests/012/struct.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/012/stslot.expected b/tests/012/stslot.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/014/dgram-stream.expected b/tests/014/dgram-stream.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/014/in6addr-str.expected b/tests/014/in6addr-str.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/014/inaddr-str.expected b/tests/014/inaddr-str.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/014/socket-basic.expected b/tests/014/socket-basic.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/015/awk-fconv.expected b/tests/015/awk-fconv.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/015/split.expected b/tests/015/split.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/015/trim.expected b/tests/015/trim.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/016/arith.expected b/tests/016/arith.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/016/ud-arith.expected b/tests/016/ud-arith.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/017/ffi-misc.expected b/tests/017/ffi-misc.expected deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/018/chmod.expected b/tests/018/chmod.expected deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3