X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cd62453970416ecd110ca3df5814b3268309f0e7..6f54f95c01d108028c7c75dbf64c8fd507c723a0:/buildtools/Cmake/generate_memcheck_tests.pl

diff --git a/buildtools/Cmake/generate_memcheck_tests.pl b/buildtools/Cmake/generate_memcheck_tests.pl
index 23d50405de..bba73157c4 100755
--- a/buildtools/Cmake/generate_memcheck_tests.pl
+++ b/buildtools/Cmake/generate_memcheck_tests.pl
@@ -1,10 +1,10 @@
 #!/usr/bin/perl -w
 use strict;
 
-# input file = CMakeTest.txt
+# input file = AddTest.txt
 
 if($#ARGV!=1) {
-    die "Usage: generate_memcheck_tests.pl <project_directory> <CMakeTests.txt>\n";
+    die "Usage: generate_memcheck_tests.pl <CMAKE_HOME_DIRECTORY> AddTests.cmake\n";
 }
 
 my($proj_dir)=$ARGV[0];
@@ -25,20 +25,25 @@ while(defined($line=<MAKETEST>)) {
 	last;
     }
     if($dump) {
-	if($line =~ /ADD_TEST/) {
-	    if($line =~ /ADD_TEST\(([\S]+)\s+.*\/tools\/tesh\/tesh\s*--cd\s*(\S+)\s+(.*)\)$/) {
+	if($line =~ /ADD_TEST/) 
+	{
+	    if($line =~ /ADD_TEST\(([\S]+)\s+.*\$\{CMAKE_BINARY_DIR\}\/bin\/tesh\s*--cd\s*(\S+)\s+(.*)\)$/) 
+	    {
 		my($name_test,$path,$tesh_file)=($1,$2,$3);
 		$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;
+		$complete_tesh_file =~ s/\$\{CMAKE_BINARY_DIR\}/$proj_dir/g;
+		$complete_tesh_file =~ s/\$\{CMAKE_HOME_DIRECTORY\}/$proj_dir/g;
 		open TESH_FILE, $complete_tesh_file or die "Unable to open $complete_tesh_file $!\n";
 		my($l);
-		while(defined($l=<TESH_FILE>)) {
+		while(defined($l=<TESH_FILE>))
+		{
 		    chomp $l;
-		    if($l =~ /^\$ (.*)$/) {
+		    if($l =~ /^\$ (.*)$/) 
+		    {
 			my($command) = $1;
 			$command =~ s/\${srcdir:=.}/./g;
 			$command =~ s/\${EXEEXT:=}//g;
@@ -46,30 +51,38 @@ while(defined($line=<MAKETEST>)) {
 			$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/\${EXEEXT}//g;
+			$command =~ s/\${srcdir}/\${CMAKE_HOME_DIRECTORY}\/src/g;
 			$command =~ s/ \$ARGS//g;
-			$command =~ s/ \$@ //g;
-			$path =~ s/\${PROJECT_DIRECTORY}/~\/Developments\/simgrid/g;
-			#$command =~ s/\${PROJECT_DIRECTORY}/~\/Developments\/simgrid/g;	
+			$command =~ s/ \$@ //g;	
+			$command =~ s/..\/..\/bin\/smpirun/\${CMAKE_BINARY_DIR\}\/bin\/smpirun/g;
+                        if($command =~ /^[^\/\$\s]+\//) {
+                            $command = $path."/".$command;
+                            $command =~ s/\/(.?\/)+/\//g;
+                        }
 			print "ADD_TEST(memcheck-$name_test-$count $command --cd $path\/)\n";
 			#push @test_list, "memcheck-$name_test-$count";
 			$count++;
 		    }
-		    if($l =~ /^\& (.*)$/) {
+		    if($l =~ /^\& (.*)$/) 
+		    {
 			last;
 		    }
 		}
 		close(TESH_FILE);
-	    } else {
+	    } 
+	    else 
+	    {
 		next;
 	    }
-	} else {
+	} 
+	else 
+	{
 	    print $line."\n";
 	}
     }   
 }
 close(MAKETEST);
-
 #print "set(MEMCHECK_LIST\n";
 #print (join("\n", @test_list));
 #print ")\n";