Rangement de scripts, essais CTest + valgrind sans Dashboard infructueux (reste dans todo/CTestCustom.cmake)

git-svn-id: file:///var/svn/2010-netlemmings/trunk@168 077b3477-7977-48bd-8428-443f22f7bfda

12 files changed, 54 insertions, 28 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c63c945..a0038b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ project (NetLemmings C)
 set (NetLemmings_VERSION_MAJOR 0)
 set (NetLemmings_VERSION_MINOR 1)
 
-set(TEST_BINARIES_PATH src/tests)
+set(TEST_SCRIPTS_PATH ${PROJECT_SOURCE_DIR}/src/test)
  
 # Include the directory itself as a path to include directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -19,5 +19,11 @@ add_definitions(-Wall -Wextra -pedantic -Werror -std=c99 -D_POSIX_SOURCE -g)
 add_subdirectory(src)
 add_subdirectory(src/test)
 
+set(ENV{LC_ALL} C)
+set(ENV{CTEST_BIN} ${PROJECT_BINARY_DIR}/src/test)
+
 enable_testing()
-add_test(testfunc001-lex TEST_BINARIES_PATH/test_lex.sh)
+add_test(testfunc000_env ${TEST_SCRIPTS_PATH}/testfunc_000_env.sh)
+add_test(testfunc001_lex ${TEST_SCRIPTS_PATH}/testfunc_001_lex.sh)
+add_test(testfunc002_parse ${TEST_SCRIPTS_PATH}/testfunc_002_parse.sh)
+add_test(testfunc003_loaddress ${TEST_SCRIPTS_PATH}/testfunc_003_loadress.sh)
diff --git a/compil.sh b/compil.sh
deleted file mode 100755
index 5804a77..0000000
--- a/compil.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash -e
-cd bin
-cmake ../
-make;
-
-if [ $# -gt 0 ]
-then	case $1 in
-		test)
-			gnome-terminal -t SERVEUR -e "bash -c './server_on_piou.sh ; sleep 15'"&
-			sleep 5;
-			gnome-terminal -t CLIENT1 -e "bash -c './netlem piou.prosoluce.fr; sleep 15'"&
-			sleep 1;
-			gnome-terminal -t CLIENT2 -e "bash -c './netlem piou.prosoluce.fr; sleep 15'"&
-		;;
-	esac
-fi
-
diff --git a/gedit.sh b/gedit.sh
deleted file mode 100755
index 504a359..0000000
--- a/gedit.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gedit *.c *.h
-
diff --git a/scripts/compil.sh b/scripts/compil.sh
new file mode 100755
index 0000000..05a2c76
--- /dev/null
+++ b/scripts/compil.sh
@@ -0,0 +1,17 @@
+#!/bin/bash -e
+cd ../bin
+cmake ../
+make
+
+if [ $# -gt 0 ]
+then	case $1 in
+		launch)
+			gnome-terminal -t SERVEUR -e "bash -c './server_on_piou.sh ; sleep 15'"&
+			sleep 5;
+			gnome-terminal -t CLIENT1 -e "bash -c '../bin/src/netlem piou.prosoluce.fr; sleep 15'"&
+			sleep 1;
+			gnome-terminal -t CLIENT2 -e "bash -c '../bin/src/netlem piou.prosoluce.fr; sleep 15'"&
+		;;
+	esac
+fi
+
diff --git a/scripts/gedit.sh b/scripts/gedit.sh
new file mode 100755
index 0000000..b11057d
--- /dev/null
+++ b/scripts/gedit.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+find ../src/ -regex '.*\.\(c\|h\)' | xargs gedit
+
diff --git a/server_on_piou.sh b/scripts/server_on_piou.sh
index 9277ad2..a2767bf 100755
--- a/server_on_piou.sh
+++ b/scripts/server_on_piou.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 ssh ludolpif@piou.prosoluce.fr killall netlem_ds
-scp ./netlem_ds ludolpif@piou.prosoluce.fr:
+scp ../bin/src/netlem_ds ludolpif@piou.prosoluce.fr:
 ssh ludolpif@piou.prosoluce.fr ./netlem_ds
 
diff --git a/svnLog.sh b/scripts/svnLog.sh
index 40fbb71..81e48cf 100755
--- a/svnLog.sh
+++ b/scripts/svnLog.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 
-path=$(pwd)
+path="../src"
 > "$path"/logSvn
 for i in $(find "$path" -type d)
 do
diff --git a/src/test/testfunc_000_env.sh b/src/test/testfunc_000_env.sh
new file mode 100755
index 0000000..c72bf50
--- /dev/null
+++ b/src/test/testfunc_000_env.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+env > /tmp/env
+
diff --git a/src/test/testfunc_001_lex.sh b/src/test/testfunc_001_lex.sh
index 452f29f..6770c26 100755
--- a/src/test/testfunc_001_lex.sh
+++ b/src/test/testfunc_001_lex.sh
@@ -1 +1,2 @@
-(cd ../parser/ && make) && make && find ../../styles/ ../../level/ -name *.ini -exec ./test_lex {} \; 2>/dev/null | less
+#!/bin/sh
+find ../../styles/ ../../level/ -name *.ini -exec ./test_lex {} \;
diff --git a/src/test/testfunc_002_parse.sh b/src/test/testfunc_002_parse.sh
index 07fa640..a437518 100755
--- a/src/test/testfunc_002_parse.sh
+++ b/src/test/testfunc_002_parse.sh
@@ -1 +1,2 @@
-(cd ../parser/ && make) && make && find ../../styles/ ../../level/ -name *.ini -exec ./test_parse {} \; 2>&1 | less
+#/bin/sh
+find ../../styles/ ../../level/ -name *.ini -exec ./test_parse {} \;
diff --git a/src/test/testfunc_003_loadress.sh b/src/test/testfunc_003_loadress.sh
index 0b744f9..11b5c3e 100755
--- a/src/test/testfunc_003_loadress.sh
+++ b/src/test/testfunc_003_loadress.sh
@@ -1 +1,2 @@
-(cd ../parser/ && make) && make && cd ../../level && find -name 'lvl*.ini' -exec ../src/test/test_load {} \; 2>&1 | less
+#/bin/sh
+find -name 'lvl*.ini' -exec ../src/test/test_load {} \;
diff --git a/todo/CTestCustom.cmake b/todo/CTestCustom.cmake
new file mode 100644
index 0000000..8f687bc
--- /dev/null
+++ b/todo/CTestCustom.cmake
@@ -0,0 +1,15 @@
+set(WITH_MEMCHECK TRUE)
+set(WITH_COVERAGE TRUE)
+
+find_program(CTEST_COVERAGE_COMMAND NAMES gcov)
+find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
+
+find_program(MemoryCheckCommand NAMES valgrind)
+#set(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE ${CTEST_SOURCE_DIRECTORY}/tests/valgrind.supp)
+
+SET (CTEST_ENVIRONMENT
+ "PATH=/bin;/usr/bin"
+ "CTEST_BLA=bouh"
+)
+
+#ctest_memcheck()