Fix generated file for memcheck.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8793 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 7429f0b..0217de8 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -209,10 +209,10 @@ endif(HAVE_GTNETS)
 
 # Lua examples
 if(HAVE_LUA)
-ADD_TEST(lua-masterslave               ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua master_slave.tesh --setenv LUA_CPATH=$ENV{LUA_CPATH}:${CMAKE_BINARY_DIR}/lib/lua/5.1/?.so)
-ADD_TEST(lua-mult_matrix               ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua mult_matrix.tesh --setenv LUA_CPATH=$ENV{LUA_CPATH}:${CMAKE_BINARY_DIR}/lib/lua/5.1/?.so)
-ADD_TEST(lua-masterslave_bypass ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua master_slave_bypass.tesh --setenv LUA_CPATH=$ENV{LUA_CPATH}:${CMAKE_BINARY_DIR}/lib/lua/5.1/?.so)
-ADD_TEST(lua-msg-masterslave-console   ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/masterslave/ masterslave_console.tesh --setenv LUA_CPATH=$ENV{LUA_CPATH}:${CMAKE_BINARY_DIR}/lib/lua/5.1/?.so)
+ADD_TEST(lua-masterslave               ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua master_slave.tesh)
+ADD_TEST(lua-mult_matrix               ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua mult_matrix.tesh)
+ADD_TEST(lua-masterslave_bypass ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/lua master_slave_bypass.tesh)
+ADD_TEST(lua-msg-masterslave-console   ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/examples/msg/masterslave/ masterslave_console.tesh)
 endif(HAVE_LUA)
 
 # Ruby examples
@@ -289,4 +289,6 @@ add_test(test-surf-trace    ${CMAKE_HOME_DIRECTORY}/testsuite/surf/trace_usage --cf
 
 add_test(testall               ${CMAKE_HOME_DIRECTORY}/src/testall)
 
+if(enable_memcheck)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake)
+endif(enable_memcheck)
\ No newline at end of file

diff --git a/buildtools/Cmake/generate_memcheck_tests.pl b/buildtools/Cmake/generate_memcheck_tests.pl
index 0e066e4..07d7bfe 100755 (executable)
--- a/buildtools/Cmake/generate_memcheck_tests.pl
+++ b/buildtools/Cmake/generate_memcheck_tests.pl
@@ -14,7 +14,6 @@ my(@test_list)=();
 
 my($line);
 my($dump)=0;
-print "if(enable_memcheck)\n";
 while(defined($line=<MAKETEST>)) {
     chomp $line;
     if($line =~ /BEGIN TESH TESTS/) {
@@ -84,7 +83,6 @@ while(defined($line=<MAKETEST>)) {
     }   
 }
 close(MAKETEST);
-print "endif(enable_memcheck)\n";
 #print "set(MEMCHECK_LIST\n";
 #print (join("\n", @test_list));
 #print ")\n";