TAPify the ancient-diffs report.
This commit is contained in:
parent
327efd3678
commit
a006bdd272
2 changed files with 11 additions and 3 deletions
|
@ -136,8 +136,8 @@ count:
|
||||||
|
|
||||||
ancient: $(SGAMES)
|
ancient: $(SGAMES)
|
||||||
@if [ -f ../advent430 ]; then cp ../advent430 ../adventure.data .; else echo "advent430 nonexistent"; exit 1; fi
|
@if [ -f ../advent430 ]; then cp ../advent430 ../adventure.data .; else echo "advent430 nonexistent"; exit 1; fi
|
||||||
@for x in *.log; do stem=$${x%.log}; echo $${stem}; ./advent430 <$${stem}.log | ./oldfilter >$${stem}.ochk; done
|
@-for x in *.log; do stem=$${x%.log}; echo $${stem}; ./advent430 <$${stem}.log | ./oldfilter >$${stem}.ochk; done
|
||||||
@for x in *.log; do stem=$${x%.log}; ./newfilter <$${stem}.chk | diff -ubZ $${stem}.ochk -; done
|
@-(for x in *.log; do stem=$${x%.log}; legend=$$(sed -n '/^## /s///p' <$$x 2>/dev/null || echo "(no description)"); ./newfilter <$${stem}.chk | tapdiffer -w "$${legend}" $${stem}.ochk; done; echo 1..$(words $(shell ls *.log))) | tapview
|
||||||
@rm *.ochk advent430 adventure.data
|
@rm *.ochk advent430 adventure.data
|
||||||
|
|
||||||
# end
|
# end
|
||||||
|
|
|
@ -8,12 +8,20 @@
|
||||||
# A nonempty diff is shipped as a TAP YAML block following "not ok"
|
# A nonempty diff is shipped as a TAP YAML block following "not ok"
|
||||||
# unless QUIET=1 in the environment.
|
# unless QUIET=1 in the environment.
|
||||||
#
|
#
|
||||||
|
if [ "$1" = "-w" ]
|
||||||
|
then
|
||||||
|
diffopts=-ubZ
|
||||||
|
shift
|
||||||
|
else
|
||||||
|
diffopts=-u
|
||||||
|
fi
|
||||||
|
|
||||||
legend=$1
|
legend=$1
|
||||||
checkfile=$2
|
checkfile=$2
|
||||||
|
|
||||||
trap 'rm /tmp/tapdiff$$' EXIT HUP INT QUIT TERM
|
trap 'rm /tmp/tapdiff$$' EXIT HUP INT QUIT TERM
|
||||||
|
|
||||||
if diff --text -u ${checkfile} - >/tmp/tapdiff$$
|
if diff --text "${diffopts}" ${checkfile} - >/tmp/tapdiff$$
|
||||||
then
|
then
|
||||||
echo "ok - ${legend}"
|
echo "ok - ${legend}"
|
||||||
else
|
else
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue