Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --git a/src/instr/jedule/jedule_sd_binding.c b/src/instr/jedule/jedule_sd_binding.c
index 2958a8b..9d31bdc 100644 (file)
--- a/src/instr/jedule/jedule_sd_binding.c
+++ b/src/instr/jedule/jedule_sd_binding.c
@@ -38,8 +38,8 @@ void jedule_log_sd_event(SD_task_t task)
 
   host_list = xbt_dynar_new(sizeof(char*), NULL);
 
-  for(i=0; i<task->workstation_nb; i++) {
-    const char *hostname = sg_host_get_name(task->workstation_list[i]);
+  for(i=0; i<task->host_count; i++) {
+    const char *hostname = sg_host_get_name(task->host_list[i]);
     xbt_dynar_push(host_list, &hostname);
   }
 

diff --git a/src/simdag/simdag_private.h b/src/simdag/simdag_private.h
index 9012302..7b81a5f 100644 (file)
--- a/src/simdag/simdag_private.h
+++ b/src/simdag/simdag_private.h
@@ -20,10 +20,6 @@ SG_BEGIN_DECL()
 /* Global variables */
 
 typedef struct SD_global {
-  sg_host_t *host_list;   /* array of workstations, created only if
-                             necessary in sg_host_list() */
-  SD_link_t *link_list;         /* array of links */
-
   xbt_mallocator_t task_mallocator; /* to not remalloc new tasks */
 
   int watch_point_reached;      /* has a task just reached a watch point? */

diff --git a/tools/cmake/scripts/generate_memcheck_tests.pl b/tools/cmake/scripts/generate_memcheck_tests.pl
index 62ec9f6..f57f8a2 100755 (executable)
--- a/tools/cmake/scripts/generate_memcheck_tests.pl
+++ b/tools/cmake/scripts/generate_memcheck_tests.pl
@@ -108,6 +108,7 @@ while ( defined( $line = <MAKETEST> ) ) {
             }
 
             my ($count)        = 0;
+            my ($close)        = 0;
             open TESH_FILE, $tesh_file or die "Unable to open tesh file: \"$tesh_file\". $!\n";
             my ($input) = "";
             my ($l);
@@ -149,6 +150,17 @@ while ( defined( $line = <MAKETEST> ) ) {
                     }
                     if ($factories) {
                       foreach my $factory (split(';', $factories)) {
+                        $close=0;
+                        if( $factory =~ /^raw/) {
+                            print "${indent}if(HAVE_RAWCTX)\n";
+                            $close=1;
+                        }elsif( $factory =~ /^boost/) {
+                            print "${indent}if(HAVE_BOOST_CONTEXT)\n";
+                            $close=1;
+                        }elsif( $factory =~ /^ucontext/) {
+                            print "${indent}if(CONTEXT_UCONTEXT)\n";
+                            $close=1;
+                        }
                         print "${indent}ADD_TEST(NAME memcheck-$name_test-$factory-$count\n";
                         print "${indent}         WORKING_DIRECTORY $path\/\n";
                         print "${indent}         COMMAND $command --cfg=contexts/factory:$factory)\n";
@@ -156,6 +168,9 @@ while ( defined( $line = <MAKETEST> ) ) {
                             print "${indent}set_tests_properties(memcheck-$name_test-$factory-$count\n";
                             print "${indent}                     PROPERTIES DEPENDS memcheck-$name_test-$factory-" . ($count - 1) . ")\n";
                         }
+                       if ($close > 0){
+                        print "${indent}endif()\n";
+                        }
                       }
                     } else {
                       print "${indent}ADD_TEST(NAME memcheck-$name_test-$count\n";

diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh
index d3dbf76..48e7696 100755 (executable)
--- a/tools/jenkins/DynamicAnalysis.sh
+++ b/tools/jenkins/DynamicAnalysis.sh
@@ -60,7 +60,7 @@ cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON \
       -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_model-checking=OFF \
       -Denable_memcheck_xml=ON $WORKSPACE
 
-ctest -D ExperimentalBuild -V || true
+ctest -D ExperimentalBuild -V
 ctest -D ExperimentalMemCheck || true
 
 cd $WORKSPACE/build
@@ -78,7 +78,7 @@ cmake -Denable_documentation=OFF -Denable_lua=ON -Denable_java=ON -Denable_traci
       -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_model-checking=ON \
       -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON -Denable_coverage=ON $WORKSPACE
 
-ctest -D ExperimentalBuild -V || true
+ctest -D ExperimentalBuild -V
 ctest -D ExperimentalTest || true
 ctest -D ExperimentalCoverage || true