Do not check our context code on hosts where configure decided not to use it (or...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2708 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/configure.ac b/configure.ac
index 08611ed..199a68e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -128,10 +128,12 @@ case $with_context in
  *) AC_MSG_ERROR("--with-context must be either ucontext or pthread") ;;
 esac
 
+USE_CONTEXT=no
 if test "x$with_context" = "xucontext" ; then
   if test ".$mcsc" = .yes; then
     AC_MSG_RESULT(found working ucontext. Great!)
     AC_DEFINE([USE_UCONTEXT],1,[Define if we use ucontext or not])
+    USE_CONTEXT=yes
   else
     if test ".$windows_context" = .yes ; then
       AC_MSG_RESULT(use windows context portability layer.)
@@ -142,6 +144,7 @@ if test "x$with_context" = "xucontext" ; then
     fi
   fi
 fi
+AC_SUBST(USE_CONTEXT)
 
 if test "x$with_context" = "xpthread"; then
   AC_CHECK_HEADERS([pthread.h])

diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in
index 5eb6290..dc589ea 100755 (executable)
--- a/testsuite/run_tests.in
+++ b/testsuite/run_tests.in
@@ -32,10 +32,13 @@ fi
 ##
 xbt_TESTS=" \
             xbt/log_usage@EXEEXT@;        \
-            xbt/context_usage@EXEEXT@;    \
             xbt/graphxml_usage@EXEEXT@ @srcdir@/xbt/graph.xml;    \
             xbt/heap_bench@EXEEXT@;"
-          
+
+if [ "x@USE_CONTEXT@" = "xyes" ] ; then
+  xbt_TESTS="$xbt_TESTS xbt/context_usage@EXEEXT@;"
+fi
+
 surf_TESTS="surf/maxmin_usage@EXEEXT@;                                        \
             surf/maxmin_bench@EXEEXT@;                                        \
            surf/trace_usage@EXEEXT@ --surf-path=@srcdir@/surf/;              \