[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated: run original tests outside of 'm
From: |
gnunet |
Subject: |
[taler-exchange] branch master updated: run original tests outside of 'make check': |
Date: |
Mon, 01 Apr 2024 12:20:28 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
The following commit(s) were added to refs/heads/master by this push:
new d9ca9ee7b run original tests outside of 'make check':
d9ca9ee7b is described below
commit d9ca9ee7b1284dce5b1af9aa8422155da53a5585
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Apr 1 12:20:17 2024 +0200
run original tests outside of 'make check':
---
contrib/ci/jobs/2-test/test.sh | 3 +++
src/templating/Makefile.am | 5 +----
src/templating/run-original-tests.sh | 10 +++-------
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
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-exchange] branch master updated: run original tests outside of 'make check':,
gnunet <=