Update tapdiffer version.
This commit is contained in:
parent
1ce4fc2ac3
commit
20e1b9d930
2 changed files with 15 additions and 5 deletions
|
@ -162,7 +162,7 @@ oldcompare:
|
||||||
else \
|
else \
|
||||||
./advent430 <$${stem}.log | oldfilter >$${stem}.ochk; \
|
./advent430 <$${stem}.log | oldfilter >$${stem}.ochk; \
|
||||||
../advent <$${stem}.log >$${stem}.log-new; \
|
../advent <$${stem}.log >$${stem}.log-new; \
|
||||||
./newfilter <$${stem}.log-new | tapdiffer -w "$${stem}: $${legend}" $${stem}.ochk; \
|
./newfilter <$${stem}.log-new | tapdiffer -b "$${stem}: $${legend}" $${stem}.ochk; \
|
||||||
fi; \
|
fi; \
|
||||||
done; \
|
done; \
|
||||||
echo 1..$(words $(shell ls *.log))) | $(TAPFILTER)
|
echo 1..$(words $(shell ls *.log))) | $(TAPFILTER)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# SPDX-FileCopyrightText: Eric S. Raymond <esr@thyrsus.com>
|
# SPDX-FileCopyrightText: Eric S. Raymond <esr@thyrsus.com>
|
||||||
# SPDX-License-Identifier: BSD-2-Clause
|
# SPDX-License-Identifier: MIT-0
|
||||||
#
|
#
|
||||||
# tapdiffer - Render diff between input and checkfile as a TAP report
|
# tapdiffer - Render diff between input and checkfile as a TAP report
|
||||||
#
|
#
|
||||||
|
@ -10,9 +10,19 @@
|
||||||
# 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" ]
|
# This code is intended to be embedded in your project. The author
|
||||||
|
# grants permission for it to be distributed under the prevailing
|
||||||
|
# license of your project if you choose, provided that license is
|
||||||
|
# OSD-compliant; otherwise the following SPDX tag incorporates the
|
||||||
|
# MIT No Attribution license by reference.
|
||||||
|
#
|
||||||
|
# A newer version may be available at https://gitlab.com/esr/tapview
|
||||||
|
# Check your last commit dqte for this file against the commit list
|
||||||
|
# there to see if it might be a good idea to update.
|
||||||
|
#
|
||||||
|
if [ "$1" = "-b" ]
|
||||||
then
|
then
|
||||||
diffopts=-ubZ
|
diffopts=-ub
|
||||||
shift
|
shift
|
||||||
else
|
else
|
||||||
diffopts=-u
|
diffopts=-u
|
||||||
|
@ -23,7 +33,7 @@ checkfile=$2
|
||||||
|
|
||||||
trap 'rm /tmp/tapdiff$$' EXIT HUP INT QUIT TERM
|
trap 'rm /tmp/tapdiff$$' EXIT HUP INT QUIT TERM
|
||||||
|
|
||||||
if diff --text "${diffopts}" ${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