From 99436bd11b850da3b63f8a2e9ed2302f013e2621 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 4 Dec 2024 14:28:31 -0800 Subject: [PATCH] tests: Make it harder to run the testsuite outside of "make check". This confused a user. --- tests/README | 2 ++ tests/automake.mk | 1 + tests/testsuite.in | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 tests/README diff --git a/tests/README b/tests/README new file mode 100644 index 0000000000..1353aa89c9 --- /dev/null +++ b/tests/README @@ -0,0 +1,2 @@ +This directory contains PSPP self-tests. To run them, run "make +check" in the top-level directory. \ No newline at end of file diff --git a/tests/automake.mk b/tests/automake.mk index eb5698738d..a33e97f35d 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -278,6 +278,7 @@ tests_output_tex_strings_CFLAGS = $(AM_CFLAGS) -I $(top_srcdir)/src/output EXTRA_DIST += \ + tests/README \ tests/coverage.sh \ tests/data/repeating-2.ods \ tests/data/simple.ods \ diff --git a/tests/testsuite.in b/tests/testsuite.in index 43d8ce4ccb..f2168ba293 100644 --- a/tests/testsuite.in +++ b/tests/testsuite.in @@ -26,6 +26,11 @@ m4_ifndef([AT_SKIP_IF], && exit 77 || exit 0], [0], [ignore], [ignore])])]) m4_divert_text([PREPARE_TESTS], [dnl +if test -z "$RUNNER" && test -z "$AUTOTEST_PATH"; then + echo >&2 "Use \"make check\" to run the testsuite." + exit 1 +fi + if test X"$RUNNER" != X; then wrapper_dir=`pwd`/wrappers rm -f "$wrapper_dir"/* -- 2.30.2