X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1935959838c77517301ec0438b61ef3a213f497d..9b947e30da1e407e9600d55420e84fca0bb5207f:/buildtools/Cmake/generate_memcheck_tests.pl

diff --git a/buildtools/Cmake/generate_memcheck_tests.pl b/buildtools/Cmake/generate_memcheck_tests.pl
index 598c690abc..6b1d9a5944 100755
--- a/buildtools/Cmake/generate_memcheck_tests.pl
+++ b/buildtools/Cmake/generate_memcheck_tests.pl
@@ -14,6 +14,7 @@ my(@test_list)=();
 
 my($line);
 my($dump)=0;
+print "if(enable_memcheck)\n";
 while(defined($line=<MAKETEST>)) {
     chomp $line;
     if($line =~ /BEGIN TESH TESTS/) {
@@ -48,11 +49,9 @@ while(defined($line=<MAKETEST>)) {
 			$command =~ s/\$EXEEXT//g;
 			$command =~ s/\${srcdir}/\${PROJECT_DIRECTORY}\/src/g;
 			$command =~ s/ \$ARGS//g;
-			$command =~ s/ \$@ //g;
-			$path =~ s/\${PROJECT_DIRECTORY}/~\/Developments\/simgrid/g;
-			#$command =~ s/\${PROJECT_DIRECTORY}/~\/Developments\/simgrid/g;	
-			print "ADD_TEST(memcheck-$name_test-$count \/bin\/sh -c \"cd $path\/ \&\& $command\")\n";
-			push @test_list, "memcheck-$name_test-$count";
+			$command =~ s/ \$@ //g;	
+			print "ADD_TEST(memcheck-$name_test-$count $command --cd $path\/)\n";
+			#push @test_list, "memcheck-$name_test-$count";
 			$count++;
 		    }
 		    if($l =~ /^\& (.*)$/) {
@@ -69,7 +68,7 @@ while(defined($line=<MAKETEST>)) {
     }   
 }
 close(MAKETEST);
-
-print "set(MEMCHECK_LIST\n";
-print (join("\n", @test_list));
-print ")\n";
+print "endif(enable_memcheck)\n";
+#print "set(MEMCHECK_LIST\n";
+#print (join("\n", @test_list));
+#print ")\n";