projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
"cheat" now has command-line arguments for generating cheat files
[open-adventure.git]
/
tests
/
Makefile
diff --git
a/tests/Makefile
b/tests/Makefile
index 2fdb8aafbaf661290bcfde7434d1853626765025..cbef1424c8a38de300cc5fb4bb3ef11a1a76ea2e 100644
(file)
--- a/
tests/Makefile
+++ b/
tests/Makefile
@@
-1,8
+1,5
@@
# Test-suite makefile for reposurgeon
# Test-suite makefile for reposurgeon
-# By setting the REPOSURGEON environment variable and using -e
-# a different implementation can be plugged in to the tests.
-
# Use absolute path so tests that change working directory still use
# scripts from parent directory. Note that using $PWD seems to fail
# here under Gitlab's CI environment.
# Use absolute path so tests that change working directory still use
# scripts from parent directory. Note that using $PWD seems to fail
# here under Gitlab's CI environment.
@@
-11,45
+8,44
@@
PATH := $(realpath ..):$(realpath .):${PATH}
# Defeat annoying behavior under Mac OS X - builtin echo doesn't do -n
ECHO := /bin/echo
# Defeat annoying behavior under Mac OS X - builtin echo doesn't do -n
ECHO := /bin/echo
-default:
- make -e --quiet all
-
-all: listcheck regress
+check: regress
@echo "=== No diff output is good news."
@echo "=== No diff output is good news."
+ @-advent -x 2>/dev/null # Get usage message into coverage tests
+ @-advent -l /dev/null <quit.log >/dev/null
.SUFFIXES: .chk
clean:
.SUFFIXES: .chk
clean:
- rm -fr *~ adventure.text
adventure.data
+ rm -fr *~ adventure.text
*.adv scratch.tmp
# Show summary lines for all tests.
testlist:
# Show summary lines for all tests.
testlist:
- @grep
--text
'^##' *.log
+ @grep '^##' *.log
listcheck:
@for f in *.log; do \
listcheck:
@for f in *.log; do \
- if ( head -3 $$f | grep -
-text -
q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
+ if ( head -3 $$f | grep -q '^ *##' ); then :; else echo "$$f needs a description"; fi; \
done
# General regression testing of commands and output; look at the *.log and
# corresponding *.chk files to see which tests this runs.
done
# General regression testing of commands and output; look at the *.log and
# corresponding *.chk files to see which tests this runs.
-TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///')
-buildregress:
adventure.data
+TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///'
| sort
)
+buildregress:
@for file in $(TESTLOADS); do \
echo "Remaking $${file}.chk"; \
@for file in $(TESTLOADS); do \
echo "Remaking $${file}.chk"; \
- $(REPOSURGEON) advent <$${file}.log >$${file}.chk \
- 2>&1 || exit 1; \
- done
-regress: adventure.data
+ OPTS=`sed -n /#options:/s///p <$${file}.log`; \
+ advent $$OPTS <$${file}.log >$${file}.chk 2>&1 || exit 1; \
+ done; \
+ rm -f scratch.tmp
+regress:
+ $(ECHO) -n "Generate cheat file: "
+ ../cheat -d -1000 -o cheat_numdie.adv
@for file in $(TESTLOADS); do \
@for file in $(TESTLOADS); do \
- $(ECHO) -n " $${file} "; grep --text '##' $${file}.log || echo ' ## (no description)'; \
- if advent < $${file}.log >/tmp/regress$$$$ 2>&1; \
+ $(ECHO) -n " $${file} "; grep '##' $${file}.log || echo ' ## (no description)'; \
+ OPTS=`sed -n /#options:/s///p <$${file}.log`; \
+ if advent $$OPTS < $${file}.log >/tmp/regress$$$$ 2>&1; \
then diff --text -u $${file}.chk /tmp/regress$$$$ || exit 1; \
else echo "*** Nonzero return status on $${file}!"; exit 1; fi \
then diff --text -u $${file}.chk /tmp/regress$$$$ || exit 1; \
else echo "*** Nonzero return status on $${file}!"; exit 1; fi \
- done
- @rm -f /tmp/regress$$$$
-
-adventure.data:
- cp "$(realpath ..)"/adventure.text .
- timeout 1 advent >/dev/null 2>&1; true
+ done; \
+ rm -f scratch.tmp /tmp/regress$$$$
# end
# end