X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e697c041ca62e634c8fa224cf4164ff4cb6ac82..18f49f2c35f0169816117401fa4b33d378ff98fa:/tools/cmake/scripts/generate_memcheck_tests.pl?ds=sidebyside

diff --git a/tools/cmake/scripts/generate_memcheck_tests.pl b/tools/cmake/scripts/generate_memcheck_tests.pl
index d37977aae5..f8ea4e9e18 100755
--- a/tools/cmake/scripts/generate_memcheck_tests.pl
+++ b/tools/cmake/scripts/generate_memcheck_tests.pl
@@ -9,10 +9,10 @@
 use strict;
 use warnings;
 
-# input file = AddTest.txt
+# input file = Test.txt
 
 if ( $#ARGV != 1 ) {
-    die "Usage: generate_memcheck_tests.pl <CMAKE_HOME_DIRECTORY> AddTests.cmake\n";
+    die "Usage: generate_memcheck_tests.pl <CMAKE_HOME_DIRECTORY> Tests.cmake\n";
 }
 
 my ($proj_dir) = $ARGV[0];
@@ -21,12 +21,12 @@ open MAKETEST, $ARGV[1] or die "Unable to open file: \"$ARGV[1]\". $!\n";
 sub var_subst {
     my ($text, $name, $value) = @_;
     if ($value) {
-        $text =~ s/\${$name(?::[=-][^}]*)?}/$value/g;
+        $text =~ s/\$\{$name(?::[=-][^}]*)?\}/$value/g;
         $text =~ s/\$$name(\W|$)/$value$1/g;
     }
     else {
-        $text =~ s/\${$name:=([^}]*)}/$1/g;
-        $text =~ s/\${$name}//g;
+        $text =~ s/\$\{$name:=([^}]*)\}/$1/g;
+        $text =~ s/\$\{$name}//g;
         $text =~ s/\$$name(\W|$)/$1/g;
     }
     return $text;
@@ -88,7 +88,7 @@ while ( defined( $line = <MAKETEST> ) ) {
             if ( $line =~ /(\S+)\s*\)$/ ) {
                 $tesh_file = $1;
                 $tesh_file =~ s/^[^\/\$]/$path\/$&/;
-                $tesh_file =~ s/\${CMAKE_HOME_DIRECTORY}/$proj_dir/g;
+                $tesh_file =~ s/\$\{CMAKE_HOME_DIRECTORY\}/$proj_dir/g;
                 if ( ! -e "$tesh_file" ) {
                     print "# tesh_file: $tesh_file does not exist!\n";
                     print "# $line\n";
@@ -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);
@@ -139,7 +140,7 @@ while ( defined( $line = <MAKETEST> ) ) {
                     }
                     if ( $command =~ /^mkfile\s+(\S+)/) {
                         my $file = $1;
-                        # don't ask me to explain why so many backslashes...
+                        # don't ask me why so many backslashes. http://xkcd.com/1638/
                         $input =~ s/\\/\\\\\\\\/g;
                         $input =~ s/\n/\\\\n/g;
                         $input =~ s/"/\\\\042/g;
@@ -149,6 +150,20 @@ while ( defined( $line = <MAKETEST> ) ) {
                     }
                     if ($factories) {
                       foreach my $factory (split(';', $factories)) {
+                        $close=0;
+                        if( $factory =~ /^raw/) {
+                            print "${indent}if(HAVE_RAW_CONTEXTS)\n";
+                            $close=1;
+                        }elsif( $factory =~ /^boost/) {
+                            print "${indent}if(HAVE_BOOST_CONTEXTS)\n";
+                            $close=1;
+                        }elsif( $factory =~ /^ucontext/) {
+                            print "${indent}if(HAVE_UCONTEXT_CONTEXTS)\n";
+                            $close=1;
+                        }elsif( $factory =~ /^thread/) {
+                            print "${indent}if(HAVE_THREAD_CONTEXTS)\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 +171,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";