X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a8207992d6e3fb13af3d4bc5777ddc1458b0592..fd9b617e50287ec42dd30c91696ae89c18018f66:/buildtools/Cmake/generate_memcheck_tests.pl

diff --git a/buildtools/Cmake/generate_memcheck_tests.pl b/buildtools/Cmake/generate_memcheck_tests.pl
index 502f4a92fa..c21936a124 100755
--- a/buildtools/Cmake/generate_memcheck_tests.pl
+++ b/buildtools/Cmake/generate_memcheck_tests.pl
@@ -31,19 +31,31 @@ while(defined($line=<MAKETEST>)) {
 		$path=~ s/\"//g;
 		my($complete_tesh_file)=$path."/".$tesh_file;
 		my($count)=0;
+		my($count_first)=0;
+		my($count_second)=0;
 		$complete_tesh_file =~ s/\${PROJECT_DIRECTORY}/$proj_dir/g;
-		open TESH_FILE, $complete_tesh_file or die "Unable to open $complete_tesh_file. $!\n";
+		open TESH_FILE, $complete_tesh_file or die "Unable to open $complete_tesh_file $!\n";
 		my($l);
 		while(defined($l=<TESH_FILE>)) {
 		    chomp $l;
 		    if($l =~ /^\$ (.*)$/) {
-			my($command)=$1;
-			$command =~ s/\${srcdir:=.}/\${PROJECT_DIRECTORY}\/src/g;
+			my($command) = $1;
+			$command =~ s/\${srcdir:=.}/./g;
 			$command =~ s/\${EXEEXT:=}//g;
-			print "ADD_TEST(memcheck-$name_test-$count /bin/sh -c 'cd $path && $command')\n";
-			push @test_list, "memcheck-$name_test-$count";
+			$command =~ s/\$SG_TEST_EXENV //g;
+			$command =~ s/\$SG_TEST_ENV //g;
+			$command =~ s/\$SG_EXENV_TEST //g; 
+			$command =~ s/\$EXEEXT//g;
+			$command =~ s/\${srcdir}/\${PROJECT_DIRECTORY}\/src/g;
+			$command =~ s/ \$ARGS//g;
+			$command =~ s/ \$@ //g;	
+			print "ADD_TEST(memcheck-$name_test-$count $command --cd $path\/)\n";
+			#push @test_list, "memcheck-$name_test-$count";
 			$count++;
 		    }
+		    if($l =~ /^\& (.*)$/) {
+			last;
+		    }
 		}
 		close(TESH_FILE);
 	    } else {
@@ -56,6 +68,6 @@ while(defined($line=<MAKETEST>)) {
 }
 close(MAKETEST);
 
-print "set(MEMCHECK_LIST\n";
-print (join("\n", @test_list));
-print ")\n";
+#print "set(MEMCHECK_LIST\n";
+#print (join("\n", @test_list));
+#print ")\n";