aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/templating/Makefile.am5
-rwxr-xr-xsrc/templating/run-original-tests.sh10
2 files changed, 4 insertions, 11 deletions
diff --git a/src/templating/Makefile.am b/src/templating/Makefile.am
index 8371045cb..713a885c5 100644
--- a/src/templating/Makefile.am
+++ b/src/templating/Makefile.am
@@ -62,10 +62,7 @@ test_mustach_jansson_LDADD = \
check_PROGRAMS = \
test_mustach_jansson
-check_SCRIPTS = \
- run-original-tests.sh
-
-TESTS = $(check_SCRIPTS) $(check_PROGRAMS)
+TESTS = $(check_PROGRAMS)
EXTRA_DIST = \
$(check_SCRIPTS) \
diff --git a/src/templating/run-original-tests.sh b/src/templating/run-original-tests.sh
index 8df0331fb..05b57ffd6 100755
--- a/src/templating/run-original-tests.sh
+++ b/src/templating/run-original-tests.sh
@@ -6,17 +6,15 @@ export CFLAGS="-g"
function build()
{
- echo "Ensuring clean state on exit ..."
- make clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS mostlyclean-compile mostlyclean-libtool
+ make clean
make
}
# Install rebuild-on-exit handler (except for kill -9)
trap build EXIT
-echo "Ensuring clean state on entry to legacy tests ..."
-
-make clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS mostlyclean-compile mostlyclean-libtool
+echo "Ensuring clean state on entry to upstream tests ..."
+make clean
# The build fails if libjson-c-dev is not installed.
# That's OK, we don't otherwise need it and don't
@@ -27,6 +25,4 @@ make -f mustach-original-Makefile clean || true
make -f mustach-original-Makefile basic-tests
make -f mustach-original-Makefile clean || true
-echo "Test done"
-
exit 0