run original tests outside of 'make check':

3 files changed, 7 insertions, 11 deletions

diff --git a/contrib/ci/jobs/2-test/test.sh b/contrib/ci/jobs/2-test/test.sh
index 4d5864cc1..940e5ef12 100755
--- a/contrib/ci/jobs/2-test/test.sh
+++ b/contrib/ci/jobs/2-test/test.sh
@@ -11,6 +11,9 @@ apt-get upgrade -yqq
 
 nump=$(grep processor /proc/cpuinfo | wc -l)
 make clean
+cd src/templating/
+./run-original-tests.sh
+cd -
 make -j$(( $nump / 2 ))
 make install
 
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