Add tests for memcheck.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6492dda..7f4bbbe 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 
 add_definitions (${INCLUDES})
 if(enable_coverage)
-add_definitions (-fprofile-arcs -ftest-coverage)
+       add_definitions (-fprofile-arcs -ftest-coverage)
 endif(enable_coverage)
 
 ### Setup Options
@@ -50,6 +50,9 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeMakeExeLib.txt)
 
 ### Make tests
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeTest.txt)
+if(enable_memcheck)
+       include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/memcheck_tests.txt)
+endif(enable_memcheck)
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CTestConfig.cmake)
 
 ### Setup the distrib

diff --git a/buildtools/Cmake/generate_memcheck_tests.pl b/buildtools/Cmake/generate_memcheck_tests.pl
new file mode 100755 (executable)
index 0000000..502f4a9
--- /dev/null
+++ b/buildtools/Cmake/generate_memcheck_tests.pl
@@ -0,0 +1,61 @@
+#!/usr/bin/perl -w
+use strict;
+
+# input file = CMakeTest.txt
+
+if($#ARGV!=1) {
+    die "Usage: generate_memcheck_tests.pl <project_directory> <CMakeTests.txt>\n";
+}
+
+my($proj_dir)=$ARGV[0];
+open MAKETEST, $ARGV[1] or die "Unable to open $ARGV[1]. $!\n";
+
+my(@test_list)=();
+
+my($line);
+my($dump)=0;
+while(defined($line=<MAKETEST>)) {
+    chomp $line;
+    if($line =~ /BEGIN TESH TESTS/) {
+       $dump = 1;
+       next;
+    } 
+    if($line =~ /END TESH TESTS/) {
+       $dump = 0;
+       last;
+    }
+    if($dump) {
+       if($line =~ /ADD_TEST/) {
+           if($line =~ /ADD_TEST\(([\S]+)\s+.*\/tools\/tesh\/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;
+               $complete_tesh_file =~ s/\${PROJECT_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>)) {
+                   chomp $l;
+                   if($l =~ /^\$ (.*)$/) {
+                       my($command)=$1;
+                       $command =~ s/\${srcdir:=.}/\${PROJECT_DIRECTORY}\/src/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";
+                       $count++;
+                   }
+               }
+               close(TESH_FILE);
+           } else {
+               next;
+           }
+       } else {
+           print $line."\n";
+       }
+    }   
+}
+close(MAKETEST);
+
+print "set(MEMCHECK_LIST\n";
+print (join("\n", @test_list));
+print ")\n";

diff --git a/buildtools/Cmake/src/CMakeOption.txt b/buildtools/Cmake/src/CMakeOption.txt
index c8c1158..9daa228 100644 (file)
--- a/buildtools/Cmake/src/CMakeOption.txt
+++ b/buildtools/Cmake/src/CMakeOption.txt
@@ -17,6 +17,7 @@ option(enable_compile_warnings "" off)
 option(enable_compile_optimizations "" off)
 option(enable_maintainer_mode "Permit to make flex and flexml files." off)
 option(enable_coverage "Enable coverage." off)
+option(enable_memcheck "Enable memcheck." off)
 option(supernovae "Supernovae mode." off)
 
 mark_as_advanced(LUA_LIB_PATH_1)                                                                                                                      

diff --git a/buildtools/Cmake/src/CMakeTest.txt b/buildtools/Cmake/src/CMakeTest.txt
index 7be0871..98cb7a8 100644 (file)
--- a/buildtools/Cmake/src/CMakeTest.txt
+++ b/buildtools/Cmake/src/CMakeTest.txt
@@ -29,7 +29,7 @@ ENDIF(SIZEOF_LONG EQUAL 4)
 INCLUDE(CTest)
 ENABLE_TESTING()
 
-# TESH autotests
+# BEGIN TESH TESTS
 ADD_TEST(tesh-self-basic               ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd "${PROJECT_DIRECTORY}/tools/tesh" basic.tesh)
 ADD_TEST(tesh-self-cd                  ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd "${PROJECT_DIRECTORY}/tools/tesh" cd.tesh)
 ADD_TEST(tesh-self-IO-broken-pipe      ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd "${PROJECT_DIRECTORY}/tools/tesh" IO-broken-pipe.tesh)
@@ -47,36 +47,17 @@ ADD_TEST(tesh-self-bg-basic         ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd "${PROJEC
 ADD_TEST(tesh-self-bg-set-signal       ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd "${PROJECT_DIRECTORY}/tools/tesh" bg-set-signal.tesh)
 ADD_TEST(tesh-self-background          ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd "${PROJECT_DIRECTORY}/tools/tesh" background.tesh)
 
-# testsuite directory
-add_test(test-xbt-log          ${PROJECT_DIRECTORY}/testsuite/xbt/log_usage)
-add_test(test-xbt-graphxml     ${PROJECT_DIRECTORY}/testsuite/xbt/graphxml_usage ${PROJECT_DIRECTORY}/testsuite/xbt/graph.xml)
-add_test(test-xbt-heap         ${PROJECT_DIRECTORY}/testsuite/xbt/heap_bench)
-
-add_test(test-surf-lmm         ${PROJECT_DIRECTORY}/testsuite/surf/lmm_usage)
-add_test(test-surf-maxmin      ${PROJECT_DIRECTORY}/testsuite/surf/maxmin_bench)
-add_test(test-surf-usage       ${PROJECT_DIRECTORY}/testsuite/surf/surf_usage  --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml)
-add_test(test-surf_usage2      ${PROJECT_DIRECTORY}/testsuite/surf/surf_usage2  --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml)
-add_test(test-surf-trace       ${PROJECT_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/)
-
-add_test(test-simdag-1 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag small_platform_variable.xml)
-add_test(test-simdag-2 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml)
-add_test(test-simdag-3 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/msg_platform.xml)
-
 # teshsuite/xbt directory
-
 ADD_TEST(tesh-log-large                ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite xbt/log_large_test.tesh)
 ADD_TEST(tesh-log-parallel     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite xbt/parallel_log_crashtest.tesh)
 
 # teshsuite/gras/datadesc directory
 ADD_TEST(tesh-gras-dd-mem      ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_mem.tesh)
 ADD_TEST(tesh-gras-dd-rw       ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_rw.tesh)
-
 ADD_TEST(tesh-gras-dd-r_little32_4     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_little32_4.tesh)
 ADD_TEST(tesh-gras-dd-r_little64       ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_little64.tesh)
 ADD_TEST(tesh-gras-dd-r_big32_8_4      ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_big32_8_4.tesh)
-
 ADD_TEST(tesh-gras-dd-r_big32_8                ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_big32_8.tesh)
-
 ADD_TEST(tesh-gras-dd-r_big32_2                ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/datadesc/datadesc_r_big32_2.tesh)
 
 IF(${ARCH_32_BITS})
@@ -94,30 +75,26 @@ ELSE(${ARCH_32_BITS})
   ADD_TEST(tesh-gras-small_sleep-sg-64 ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite gras/small_sleep/test_sg_64)
 ENDIF(${ARCH_32_BITS})
 
-ADD_TEST(tesh-msg-get_sender   ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "msg/get_sender.tesh")
-                                   
-ADD_TEST(tesh-simdag-reinit_costs      ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/test_reinit_costs.tesh")
-ADD_TEST(tesh-simdag-parser            ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/platforms/basic_parsing_test.tesh")
-ADD_TEST(tesh-simdag-flatifier         ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/platforms/flatifier.tesh")
-
-ADD_TEST(tesh-simdag-basic0    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic0.tesh")
-ADD_TEST(tesh-simdag-basic1    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic1.tesh")
-ADD_TEST(tesh-simdag-basic2    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic2.tesh")
-ADD_TEST(tesh-simdag-basic3    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic3.tesh")
-ADD_TEST(tesh-simdag-basic4    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic4.tesh")
-ADD_TEST(tesh-simdag-basic5    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic5.tesh")
-ADD_TEST(tesh-simdag-basic6    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/basic6.tesh")
-ADD_TEST(tesh-simdag-p2p-1     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/p2p/test_latency1.tesh")
-ADD_TEST(tesh-simdag-p2p-2     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/p2p/test_latency2.tesh")
-ADD_TEST(tesh-simdag-p2p-3     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/p2p/test_latency3.tesh")
-ADD_TEST(tesh-simdag-p2p-3     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/p2p/test_latency_bound.tesh")
-
-ADD_TEST(tesh-simdag-mxn-1     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/mxn/test_intra_all2all.tesh")
-ADD_TEST(tesh-simdag-mxn-2     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/mxn/test_intra_independent_comm.tesh")
-ADD_TEST(tesh-simdag-mxn-3     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/network/mxn/test_intra_scatter.tesh")
-
-ADD_TEST(tesh-simdag-par-1     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/partask/test_comp_only_seq.tesh")
-ADD_TEST(tesh-simdag-par-2     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite "simdag/partask/test_comp_only_par.tesh")
+ADD_TEST(tesh-msg-get_sender   ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite msg/get_sender.tesh)                               
+ADD_TEST(tesh-simdag-reinit_costs      ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/test_reinit_costs.tesh)
+ADD_TEST(tesh-simdag-parser            ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/platforms/basic_parsing_test.tesh)
+ADD_TEST(tesh-simdag-flatifier         ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/platforms/flatifier.tesh)
+ADD_TEST(tesh-simdag-basic0    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic0.tesh)
+ADD_TEST(tesh-simdag-basic1    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic1.tesh)
+ADD_TEST(tesh-simdag-basic2    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic2.tesh)
+ADD_TEST(tesh-simdag-basic3    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic3.tesh)
+ADD_TEST(tesh-simdag-basic4    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic4.tesh)
+ADD_TEST(tesh-simdag-basic5    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic5.tesh)
+ADD_TEST(tesh-simdag-basic6    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic6.tesh)
+ADD_TEST(tesh-simdag-p2p-1     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency1.tesh)
+ADD_TEST(tesh-simdag-p2p-2     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency2.tesh)
+ADD_TEST(tesh-simdag-p2p-3     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency3.tesh)
+ADD_TEST(tesh-simdag-p2p-3     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/p2p/test_latency_bound.tesh)
+ADD_TEST(tesh-simdag-mxn-1     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_all2all.tesh)
+ADD_TEST(tesh-simdag-mxn-2     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_independent_comm.tesh)
+ADD_TEST(tesh-simdag-mxn-3     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/network/mxn/test_intra_scatter.tesh)
+ADD_TEST(tesh-simdag-par-1     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/partask/test_comp_only_seq.tesh)
+ADD_TEST(tesh-simdag-par-2     ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/partask/test_comp_only_par.tesh)
 
 # GRAS examples
 ADD_TEST(gras-ping-rl  ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/gras/ping test_rl)
@@ -190,17 +167,9 @@ ADD_TEST(simdag-test_simdag2       ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT
 ADD_TEST(simdag-test_prop      ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag properties/test_prop.tesh)
 ADD_TEST(simdag-metaxml_test   ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/simdag metaxml/metaxml_test.tesh)
 
-if(HAVE_JAVA)
-# java examples
-ADD_TEST(java-basic    ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/basic BasicTest)
-ADD_TEST(java-pingpong         ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/ping_pong PingPongTest)
-ADD_TEST(java-comm_time ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/comm_time CommTimeTest)
-ADD_TEST(java-suspend  ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/suspend SuspendTest)
-endif(HAVE_JAVA)
 # smpi examples
 ADD_TEST(smpi-bcast    ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/smpi bcast.tesh)
 ADD_TEST(smpi-reduce   ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/smpi reduce.tesh)
-
 if(HAVE_GTNETS)
 ADD_TEST(msg-gtnets1   ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-waxman.tesh)
 ADD_TEST(msg-gtnets2   ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-dogbone-gtnets.tesh)
@@ -209,6 +178,31 @@ ADD_TEST(msg-gtnets4       ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTO
 ADD_TEST(msg-gtnets5   ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg gtnets/gtnets-onelink-lv08.tesh)
 endif(HAVE_GTNETS)
 
+# END TESH TESTS
+
+# testsuite directory
+add_test(test-xbt-log          ${PROJECT_DIRECTORY}/testsuite/xbt/log_usage)
+add_test(test-xbt-graphxml     ${PROJECT_DIRECTORY}/testsuite/xbt/graphxml_usage ${PROJECT_DIRECTORY}/testsuite/xbt/graph.xml)
+add_test(test-xbt-heap         ${PROJECT_DIRECTORY}/testsuite/xbt/heap_bench)
+
+add_test(test-surf-lmm         ${PROJECT_DIRECTORY}/testsuite/surf/lmm_usage)
+add_test(test-surf-maxmin      ${PROJECT_DIRECTORY}/testsuite/surf/maxmin_bench)
+add_test(test-surf-usage       ${PROJECT_DIRECTORY}/testsuite/surf/surf_usage  --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml)
+add_test(test-surf_usage2      ${PROJECT_DIRECTORY}/testsuite/surf/surf_usage2  --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml)
+add_test(test-surf-trace       ${PROJECT_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/)
+
+add_test(test-simdag-1 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag small_platform_variable.xml)
+add_test(test-simdag-2 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml)
+add_test(test-simdag-3 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/msg_platform.xml)
+
+if(HAVE_JAVA)
+# java examples
+ADD_TEST(java-basic    ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/basic BasicTest)
+ADD_TEST(java-pingpong         ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/ping_pong PingPongTest)
+ADD_TEST(java-comm_time ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/comm_time CommTimeTest)
+ADD_TEST(java-suspend  ${PROJECT_DIRECTORY}/buildtools/Cmake/test_java.sh ${PROJECT_DIRECTORY}/examples/java/suspend SuspendTest)
+endif(HAVE_JAVA)
+
 ###
 ### Declare that we know that some tests are broken
 ###

diff --git a/buildtools/Cmake/src/memcheck_tests.txt b/buildtools/Cmake/src/memcheck_tests.txt
new file mode 100644 (file)
index 0000000..ab522d0
--- /dev/null
+++ b/buildtools/Cmake/src/memcheck_tests.txt
@@ -0,0 +1,15 @@
+# teshsuite/xbt directory
+ADD_TEST(memcheck-tesh-log-large       ${PROJECT_DIRECTORY}/teshsuite/xbt/log_large_test)
+ADD_TEST(memcheck-tesh-log-parallel    ${PROJECT_DIRECTORY}/teshsuite/xbt/parallel_log_crashtest)
+# teshsuite/gras/datadesc directory
+ADD_TEST(memcheck-tesh-gras-dd-copy    ${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/datadesc_usage --copy)
+ADD_TEST(memcheck-tesh-gras-dd-write   ${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/datadesc_usage --write)
+ADD_TEST(memcheck-tesh-gras-dd-read    ${PROJECT_DIRECTORY}/teshsuite/gras/datadesc/datadesc_usage --read)
+
+set(MEMCHECK_LIST
+memcheck-tesh-log-large
+memcheck-tesh-log-parallel
+memcheck-tesh-gras-dd-copy
+memcheck-tesh-gras-dd-write
+memcheck-tesh-gras-dd-read
+)