From 8db5b24ed8e2ac545a35960a4e90a0f6ff0e51ed Mon Sep 17 00:00:00 2001
From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 9 Apr 2010 14:19:53 +0000
Subject: [PATCH] Add testall to test.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7521 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 buildtools/Cmake/src/CMakeDefinePackages.txt | 12 +++++++++++-
 buildtools/Cmake/src/CMakeMaintainerMode.txt |  8 --------
 buildtools/Cmake/src/CMakeTest.txt           |  2 ++
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 77953dfd83..5229b31d08 100644
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -686,7 +686,17 @@ set(to_svg
 	${PROJECT_DIRECTORY}/./src/bindings/ruby_bindings.h
 	${PROJECT_DIRECTORY}/./src/simix/smx_context_sysv_private.h
 	${PROJECT_DIRECTORY}/./src/simgrid_units_main.c
-	${TEST_UNITS}
+	${PROJECT_DIRECTORY}/./src/cunit_unit.c
+	${PROJECT_DIRECTORY}/./src/ex_unit.c
+	${PROJECT_DIRECTORY}/./src/dynar_unit.c
+	${PROJECT_DIRECTORY}/./src/dict_unit.c
+	${PROJECT_DIRECTORY}/./src/set_unit.c
+	${PROJECT_DIRECTORY}/./src/swag_unit.c
+	${PROJECT_DIRECTORY}/./src/xbt_str_unit.c
+	${PROJECT_DIRECTORY}/./src/xbt_strbuff_unit.c
+	${PROJECT_DIRECTORY}/./src/xbt_sha_unit.c
+	${PROJECT_DIRECTORY}/./src/config_unit.c
+	${PROJECT_DIRECTORY}/./src/xbt_synchro_unit.c
 	${PROJECT_DIRECTORY}/./src/bindings/lua/master_slave.lua
 	${PROJECT_DIRECTORY}/./src/bindings/lua/mult_matrix.lua
 	${PROJECT_DIRECTORY}/./examples/lua/master_slave.lua
diff --git a/buildtools/Cmake/src/CMakeMaintainerMode.txt b/buildtools/Cmake/src/CMakeMaintainerMode.txt
index f71d198791..8b5008344b 100644
--- a/buildtools/Cmake/src/CMakeMaintainerMode.txt
+++ b/buildtools/Cmake/src/CMakeMaintainerMode.txt
@@ -114,14 +114,6 @@ if(PERL_EXE)
 	#@builddir@/simgrid_units_main.c: $(TEST_UNITS)
 	exec_program("${PROJECT_DIRECTORY}/tools/sg_unit_extractor.pl ${PROJECT_DIRECTORY}/src/xbt/cunit.c" "${PROJECT_DIRECTORY}/src/")
 
-	#clean-units:
-	foreach(file ${TEST_UNITS})
-		exec_program("echo ${file}|sed -e 's|.c$$|.Po|' -e 's|[^/]*/||' -e 's|^|.deps/|'" "${PROJECT_DIRECTORY}/src/" OUTPUT_VARIABLE dep)
-		exec_program("echo \"Removing dependency tracker of ${file} (${dep} ${PROJECT_DIRECTORY}/src/${dep})\"" OUTPUT_VARIABLE OKITOKI)
-		message("${OKITOKI}")
-		exec_program("rm -vf ${dep} ${PROJECT_DIRECTORY}/src/${dep}" "${PROJECT_DIRECTORY}/src/" OUTPUT_VARIABLE OKITOKI)
-		exec_program("touch ${dep}" "${PROJECT_DIRECTORY}/src/" OUTPUT_VARIABLE OKITOKI)
-	endforeach(file ${TEST_UNITS})
 else(PERL_EXE)
 	message(FATAL_ERROR "Install perl before use maintainer mode")
 endif(PERL_EXE)
diff --git a/buildtools/Cmake/src/CMakeTest.txt b/buildtools/Cmake/src/CMakeTest.txt
index b16df9b074..ea59a63f3b 100644
--- a/buildtools/Cmake/src/CMakeTest.txt
+++ b/buildtools/Cmake/src/CMakeTest.txt
@@ -235,6 +235,8 @@ add_test(test-simdag-1 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:
 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)
 
+add_test(testall		${PROJECT_DIRECTORY}/src/testall)
+
 if(enable_memcheck)
 	include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/memcheck_tests.txt)
 endif(enable_memcheck)
-- 
2.20.1