summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Mikkelsen <petermikkelsen10@gmail.com>2026-05-16 19:16:43 +0200
committerPeter Mikkelsen <petermikkelsen10@gmail.com>2026-05-16 19:16:43 +0200
commit60c48f4d5df503c02795d81a60f88dc033c2eb4b (patch)
treeafbb39afd92cac57d377701c105e001f77122596
parent6baf6465f715886ab490d80d712120c7bdf9e9e5 (diff)
Switch to using dejagnu for 'make check'
No tests yet. This commit exists just to see if the automatic builds will correctly run the tests and report failures.
-rw-r--r--.builds/debian.yml1
-rw-r--r--.builds/freebsd.yml1
-rw-r--r--.builds/openbsd.yml1
-rw-r--r--configure.ac3
-rw-r--r--guix.scm.in6
-rw-r--r--po/da.po2
-rw-r--r--tests/Makefile.am25
-rw-r--r--tests/aplwc.bin/example.exp2
-rw-r--r--tests/aplwc.lib/example.exp3
-rw-r--r--tests/atlocal.in1
-rw-r--r--tests/lib/aplwc.exp1
-rw-r--r--tests/package.m4.in6
-rw-r--r--tests/testsuite.at19
13 files changed, 20 insertions, 51 deletions
diff --git a/.builds/debian.yml b/.builds/debian.yml
index 4452060..218513e 100644
--- a/.builds/debian.yml
+++ b/.builds/debian.yml
@@ -10,6 +10,7 @@ packages:
- autopoint
- libreadline-dev
- texlive-full
+- dejagnu
tasks:
- build: |
cd aplwc
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 545a079..c2211dd 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -8,6 +8,7 @@ packages:
- help2man
- texinfo
- texlive-full
+- dejagnu
tasks:
- build: |
cd aplwc
diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml
index 0856a6e..85800bb 100644
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -7,6 +7,7 @@ packages:
- help2man
- texinfo
- texlive_texmf-full
+- dejagnu
tasks:
- build: |
cd aplwc
diff --git a/configure.ac b/configure.ac
index 2ddb6a5..44865e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,6 @@ AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIRS([m4])
-AC_CONFIG_TESTDIR([tests])
AC_PREREQ([2.71])
VERSION_NUMBER=`cd $srcdir && build-aux/git-version-gen .tarball-version`
@@ -34,8 +33,6 @@ AC_CONFIG_FILES([
gnu/Makefile
po/Makefile.in
tests/Makefile
- tests/package.m4
- tests/atlocal
guix.scm
lib/aplwc.pc
scripts/publish-release
diff --git a/guix.scm.in b/guix.scm.in
index 7f4142a..2622d0d 100644
--- a/guix.scm.in
+++ b/guix.scm.in
@@ -5,7 +5,8 @@
(gnu packages autotools)
(gnu packages readline)
(gnu packages pkg-config)
- (gnu packages man))
+ (gnu packages man)
+ (gnu packages dejagnu))
(package
(name "@PACKAGE_NAME@")
@@ -17,7 +18,8 @@
(native-inputs
(list autoconf
pkg-config
- help2man))
+ help2man
+ dejagnu))
(synopsis "A programming language with constraints")
(description "...")
(home-page "https://aplwc.org")
diff --git a/po/da.po b/po/da.po
index 607ed7a..555e6ac 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: aplwc 0.1.6-fa0c-modified\n"
"Report-Msgid-Bugs-To: bug-aplwc@gnu.org\n"
-"POT-Creation-Date: 2026-04-29 19:26+0200\n"
+"POT-Creation-Date: 2026-05-16 11:26+0200\n"
"PO-Revision-Date: 2026-04-03 14:54+0200\n"
"Last-Translator: <>\n"
"Language-Team: Danish\n"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 44e31d3..086e276 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,19 +1,6 @@
-TESTSUITE_SRC = $(srcdir)/testsuite.at
-TESTSUITE = $(builddir)/testsuite
-EXTRA_DIST = $(TESTSUITE_SRC)
-
-DISTCLEANFILES = $(TESTSUITE) atconfig
-
-AUTOM4TE = $(SHELL) $(top_srcdir)/build-aux/missing --run autom4te
-AUTOTEST = $(AUTOM4TE) --language=autotest
-
-$(TESTSUITE): $(TESTSUITE_SRC)
- $(AUTOTEST) $(TESTSUITE_SRC) > $(TESTSUITE)
-
-check-local: $(TESTSUITE)
- $(SHELL) $(TESTSUITE)
-
-clean-local:
- test ! -f $(TESTSUITE) || \
- $(SHELL) $(TESTSUITE) --clean
-
+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
new file mode 100644
index 0000000..15ba15c
--- /dev/null
+++ b/tests/aplwc.bin/example.exp
@@ -0,0 +1,2 @@
+spawn "${aplwc_bin}"
+fail "not implemented"
diff --git a/tests/aplwc.lib/example.exp b/tests/aplwc.lib/example.exp
new file mode 100644
index 0000000..92e00d8
--- /dev/null
+++ b/tests/aplwc.lib/example.exp
@@ -0,0 +1,3 @@
+spawn "${aplwc_bin}"
+fail "not implemented"
+
diff --git a/tests/atlocal.in b/tests/atlocal.in
deleted file mode 100644
index d105ffc..0000000
--- a/tests/atlocal.in
+++ /dev/null
@@ -1 +0,0 @@
-PATH=@abs_top_builddir@/src:$PATH
diff --git a/tests/lib/aplwc.exp b/tests/lib/aplwc.exp
new file mode 100644
index 0000000..4406dff
--- /dev/null
+++ b/tests/lib/aplwc.exp
@@ -0,0 +1 @@
+set aplwc_bin "${objdir}/../src/aplwc"
diff --git a/tests/package.m4.in b/tests/package.m4.in
deleted file mode 100644
index 6db7b87..0000000
--- a/tests/package.m4.in
+++ /dev/null
@@ -1,6 +0,0 @@
-m4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@]);
-m4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@]);
-m4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@]);
-m4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@]);
-m4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@]);
-m4_define([AT_PACKAGE_URL], [@PACKAGE_URL@]);
diff --git a/tests/testsuite.at b/tests/testsuite.at
deleted file mode 100644
index 41af6b5..0000000
--- a/tests/testsuite.at
+++ /dev/null
@@ -1,19 +0,0 @@
-AT_INIT([aplwc-repl test suite])
-AT_COLOR_TESTS
-
-AT_SETUP([Command line arguments])
-AT_TESTED([aplwc])
-AT_CHECK([aplwc --version | sed 1q], [0], [AT_PACKAGE_NAME AT_PACKAGE_VERSION
-])
-AT_CHECK([aplwc -v | sed 1q], [0], [AT_PACKAGE_NAME AT_PACKAGE_VERSION
-])
-AT_CHECK([aplwc --help | sed 1q], [0], [Usage: aplwc [[OPTION...]]
-])
-AT_CHECK([aplwc --h | sed 1q], [0], [Usage: aplwc [[OPTION...]]
-])
-AT_CHECK([aplwc --some-unknown-long-option], [1], ignore, ignore)
-AT_CHECK([aplwc -k], [1], ignore, ignore)
-AT_CHECK([aplwc --help | grep -e '-v, --version'], [0], ignore)
-AT_CHECK([aplwc --help | grep -e '-h, --help'], [0], ignore)
-AT_CHECK([aplwc --help | grep -e '-k, --ksdfsgs'], [1], ignore, ignore)
-AT_CLEANUP \ No newline at end of file