This is an automated email from the git hooks/post-receive script. logari81 pushed a commit to branch master in repository getfem.
The following commit(s) were added to refs/heads/master by this push: new ebeaddb0 Fix test runs ebeaddb0 is described below commit ebeaddb0ef5e65cdd41532ac38671696c03d437c Author: Konstantinos Poulios <logar...@gmail.com> AuthorDate: Thu Mar 7 18:55:54 2024 +0100 Fix test runs --- interface/tests/python/Makefile.am | 2 +- tests/make_gmm_test.pl | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/interface/tests/python/Makefile.am b/interface/tests/python/Makefile.am index 753c59aa..6e7f1306 100644 --- a/interface/tests/python/Makefile.am +++ b/interface/tests/python/Makefile.am @@ -84,7 +84,7 @@ TESTS = \ $(optpy) AM_TESTS_ENVIRONMENT = \ - export PYTHONPATH=$(top_builddir)/interface/src/python; \ + export PYTHONPATH=$(PYTHONPATH):$(top_builddir)/interface/src/python; \ export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(top_builddir)/src/.libs; LOG_COMPILER = $(PYTHON) endif diff --git a/tests/make_gmm_test.pl b/tests/make_gmm_test.pl index f469c5da..313a2fdc 100755 --- a/tests/make_gmm_test.pl +++ b/tests/make_gmm_test.pl @@ -336,8 +336,12 @@ for ($iter = 1; $iter <= $nb_iter; ++$iter) { $compilo=`sh ../gmm-config --cxx` || die('cannot execute ../gmm-config --cxx'); chomp($compilo); $compile_options=`sh ../gmm-config --build-flags`; chomp($compile_options); + $compile_options=$compile_options . " " . `sh ../gmm-config --cflags`; + chomp($compile_options); $compile_options="$compile_options -I$srcdir/../src -I$srcdir/../include -I../src -I../include"; - $compile_libs=`sh ../gmm-config --libs`; + $compile_libs=`sh ../gmm-config --build-libs`; + chomp($compile_libs); + $compile_libs=$compile_libs . " " . `sh ../gmm-config --libs`; if ($with_qd) { $compile_libs="-lqd $compile_libs"; } # print "$compilo $compile_options $dest_name -o $root_name $compile_libs\n"; print `$compilo $compile_options $dest_name -o $root_name $compile_libs`;