From 4f0e09208f2a312fef54439597add2312a86cd72 Mon Sep 17 00:00:00 2001 From: Peter Mikkelsen Date: Sat, 16 May 2026 19:55:28 +0200 Subject: Rename test directory to testsuite --- .gitignore | 1 + Makefile.am | 2 +- configure.ac | 3 ++- tests/Makefile.am | 6 ------ tests/aplwc.bin/example.exp | 2 -- tests/aplwc.lib/example.exp | 3 --- tests/lib/aplwc.exp | 1 - testsuite/Makefile.am | 8 ++++++++ testsuite/aplwc.bin/example.exp | 2 ++ testsuite/aplwc.lib/example.exp | 3 +++ testsuite/site_extra.exp.in | 1 + 11 files changed, 18 insertions(+), 14 deletions(-) delete mode 100644 tests/Makefile.am delete mode 100644 tests/aplwc.bin/example.exp delete mode 100644 tests/aplwc.lib/example.exp delete mode 100644 tests/lib/aplwc.exp create mode 100644 testsuite/Makefile.am create mode 100644 testsuite/aplwc.bin/example.exp create mode 100644 testsuite/aplwc.lib/example.exp create mode 100644 testsuite/site_extra.exp.in diff --git a/.gitignore b/.gitignore index e5afc7d..743cb92 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ aplwc-*.tar.* /.gdb_history /lib/.gdb_history /src/.gdb_history +/testsuite/site_extra.exp diff --git a/Makefile.am b/Makefile.am index afb820f..05141f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ EXTRA_DIST = m4/gnulib-cache.m4 -SUBDIRS = gnu lib src doc po tests +SUBDIRS = gnu lib src doc po testsuite dist-hook: dist-tarball-version .PHONY: dist-tarball-version diff --git a/configure.ac b/configure.ac index 44865e8..4d18988 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,8 @@ AC_CONFIG_FILES([ doc/Makefile gnu/Makefile po/Makefile.in - tests/Makefile + testsuite/Makefile + testsuite/site_extra.exp guix.scm lib/aplwc.pc scripts/publish-release diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 086e276..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -AUTOMAKE_OPTIONS = dejagnu -CLEANFILES = *.log *.sum site.* -EXTRA_DIST = \ - lib/*.exp \ - aplwc.bin/*.exp \ - aplwc.lib/*.exp diff --git a/tests/aplwc.bin/example.exp b/tests/aplwc.bin/example.exp deleted file mode 100644 index 15ba15c..0000000 --- a/tests/aplwc.bin/example.exp +++ /dev/null @@ -1,2 +0,0 @@ -spawn "${aplwc_bin}" -fail "not implemented" diff --git a/tests/aplwc.lib/example.exp b/tests/aplwc.lib/example.exp deleted file mode 100644 index 92e00d8..0000000 --- a/tests/aplwc.lib/example.exp +++ /dev/null @@ -1,3 +0,0 @@ -spawn "${aplwc_bin}" -fail "not implemented" - diff --git a/tests/lib/aplwc.exp b/tests/lib/aplwc.exp deleted file mode 100644 index 4406dff..0000000 --- a/tests/lib/aplwc.exp +++ /dev/null @@ -1 +0,0 @@ -set aplwc_bin "${objdir}/../src/aplwc" diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am new file mode 100644 index 0000000..51c1011 --- /dev/null +++ b/testsuite/Makefile.am @@ -0,0 +1,8 @@ +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DEJAGNU_SITE_CONFIG = site_extra.exp +DEJATOOL = aplwc.bin aplwc.lib +CLEANFILES = *.log *.sum site.exp +EXTRA_DIST = \ + lib/*.exp \ + aplwc.bin/*.exp \ + aplwc.lib/*.exp diff --git a/testsuite/aplwc.bin/example.exp b/testsuite/aplwc.bin/example.exp new file mode 100644 index 0000000..15ba15c --- /dev/null +++ b/testsuite/aplwc.bin/example.exp @@ -0,0 +1,2 @@ +spawn "${aplwc_bin}" +fail "not implemented" diff --git a/testsuite/aplwc.lib/example.exp b/testsuite/aplwc.lib/example.exp new file mode 100644 index 0000000..92e00d8 --- /dev/null +++ b/testsuite/aplwc.lib/example.exp @@ -0,0 +1,3 @@ +spawn "${aplwc_bin}" +fail "not implemented" + diff --git a/testsuite/site_extra.exp.in b/testsuite/site_extra.exp.in new file mode 100644 index 0000000..819c30f --- /dev/null +++ b/testsuite/site_extra.exp.in @@ -0,0 +1 @@ +set aplwc_bin @abs_top_builddir@/src/aplwc -- cgit v1.2.3