From 3d5a550c9ac944a71ea5f8e87ecef9e310fe497d Mon Sep 17 00:00:00 2001 From: alegrand Date: Mon, 24 Apr 2006 16:47:20 +0000 Subject: [PATCH 1/1] Use absolute dir for testsuite as relative paths results in weird behavior on MacOSX git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2182 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- configure.ac | 4 ++++ testsuite/Makefile.am | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 077635847b..faf44ffc3f 100644 --- a/configure.ac +++ b/configure.ac @@ -203,6 +203,10 @@ SG_COMPILE_FLAGS AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) +AC_SUBST([abs_builddir]) +AC_SUBST([abs_srcdir]) +AC_SUBST([abs_top_builddir]) +AC_SUBST([abs_top_srcdir]) ##################### ## Check for programs diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 940aced8e0..b588e71a77 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -35,7 +35,7 @@ SG_tests = \ surf/maxmin_usage surf/maxmin_bench \ surf/trace_usage surf/surf_usage surf/surf_usage2 -noinst_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests) +check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests) check_SCRIPTS = run_tests gras/trp_tcp_usage TESTS=run_tests @@ -45,8 +45,8 @@ valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS) ./run_tests valgrind # LDADD_UTILS is still a separate var to distinguish core tester from RL tester -LDADD_SG=$(top_builddir)/src/libsimgrid.la -LDADD_RL=$(top_builddir)/src/libgras.la +LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la +LDADD_RL=$(abs_top_builddir)/src/libgras.la xbt_log_usage_LDADD= $(LDADD_RL) -- 2.20.1