Replace TAP testsuite macros with dxcommon versions.

These were imported into dxcommon, so adjust the testsuite to use them.

diff --git a/common b/common
index 207d0dbfbbfa7ad70b59ada3a741895842958885..f1527e8c5958c25abb54818a2e9618a85a75bec0 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 207d0dbfbbfa7ad70b59ada3a741895842958885
+Subproject commit f1527e8c5958c25abb54818a2e9618a85a75bec0

diff --git a/testsuite.at b/testsuite.at
index c00be4810a0150ce8fdaaa500e8ff8c50f6fa99c..0a792abfd6f7af8faf97820c95bebca8c1694bc3 100644 (file)
--- 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 <<EOF'; cat "$program.tap"; echo 'EOF'; } >"$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])