X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/620666cb593cbba6f9de6921982ad017f2cb7939..8886d8f66a892e715ddf32282526c1030f9c674a:/buildtools/Cmake/generate_memcheck_tests.pl

diff --git a/buildtools/Cmake/generate_memcheck_tests.pl b/buildtools/Cmake/generate_memcheck_tests.pl
index 5a199bf89e..ece91f7f27 100755
--- a/buildtools/Cmake/generate_memcheck_tests.pl
+++ b/buildtools/Cmake/generate_memcheck_tests.pl
@@ -49,13 +49,13 @@ while(defined($line=<MAKETEST>))
 			}
 			if($line =~ /--cfg\s*\t*(\S*)/)
 			{
-				$config_var = "--cfg $1 $config_var";
+				$config_var = "--cfg=$1 $config_var";
 			}
 			if($line =~ /--cd\s*(\S+)/)
 			{
 				$path=($1);
 				$path=~ s/\"//g;
-				$path =~ s/\$\{CMAKE_BINARY_DIR\}/$proj_dir/g;
+#				$path =~ s/\$\{CMAKE_BINARY_DIR\}/$proj_dir/g;
 				$path =~ s/\$\{CMAKE_HOME_DIRECTORY\}/$proj_dir/g;
 			}
 			if($line =~ /--setenv\s*\t*(\S*)\=(\S*)/)
@@ -75,8 +75,7 @@ while(defined($line=<MAKETEST>))
 			if($line =~ /([\S]+)[)]$/)
 			{
 				$tesh_file =($1);
-				$tesh_file =~ s/\$\{CMAKE_BINARY_DIR\}/$proj_dir/g;
-				$tesh_file =~ s/\$\{CMAKE_HOME_DIRECTORY\}/$proj_dir/g;
+				$tesh_file =~ s/\${CMAKE_HOME_DIRECTORY}/$proj_dir/g;
 				if ( -e "$tesh_file")
 				{
 					
@@ -88,6 +87,8 @@ while(defined($line=<MAKETEST>))
 				}
 				else
 				{
+					print "tesh_file : $tesh_file not exists!\n";
+					print "tesh_file : $path\/$tesh_file not exists!\n";
 					die;
 				}
 				
@@ -128,6 +129,7 @@ while(defined($line=<MAKETEST>))
                 	$command = $path."/".$command;
                 	$command =~ s/\/(.?\/)+/\//g;
                 }
+                $command =~ s/$proj_dir/\$\{CMAKE_BINARY_DIR\}/g;
                 if ($config_var)
                 {
                 	$command = "$command $config_var";