From 30e0f517cb2e7bc769d79a7016521b99813a9efa Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Mon, 12 Jun 2023 21:19:20 -0400 Subject: [PATCH] Replace TAP testsuite macros with dxcommon versions. These were imported into dxcommon, so adjust the testsuite to use them. --- common | 2 +- testsuite.at | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/common b/common index 207d0db..f1527e8 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 207d0dbfbbfa7ad70b59ada3a741895842958885 +Subproject commit f1527e8c5958c25abb54818a2e9618a85a75bec0 diff --git a/testsuite.at b/testsuite.at index c00be48..0a792ab 100644 --- a/testsuite.at +++ b/testsuite.at @@ -16,26 +16,7 @@ AT_COPYRIGHT([Copyright © 2022-2023 Nick Bowler]) AT_INIT AT_COLOR_TESTS -m4_divert_push([PREPARE_TESTS])dnl -test_run_tap () { - program=$1; shift - - "$builddir/t/$program" "$@" > "$program.tap" - status=$? - cat "$program.tap" - :; { echo 'print <"$program.pl" - prove "$program.pl" 2>&1 - return $status -} -m4_divert_pop([PREPARE_TESTS]) - -m4_define([TEST_TAP], [AT_CHECK([test_run_tap $1], [0], [ignore])]) -m4_define([TEST_TAP_SIMPLE], [dnl -AT_SETUP([$1]) -AT_KEYWORDS([$4])dnl -m4_n([$3])dnl -TEST_TAP([$2]) -AT_CLEANUP]) +m4_include([common/snippet/test-tap.at]) m4_include([tests/game.at]) m4_include([tests/gui.at]) -- 2.43.2