changeset 348:d978dd58a1d9

Improved management of the source directory in tests
author Sebastien Decugis <sdecugis@nict.go.jp>
date Tue, 29 Jun 2010 16:21:14 +0900
parents 69ec5dcc1fb2
children 734187f7111c
files contrib/nightly_tests/nosctp.conf contrib/nightly_tests/runtests.sh contrib/nightly_tests/tests.list
diffstat 3 files changed, 17 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/nightly_tests/nosctp.conf	Tue Jun 29 16:21:14 2010 +0900
@@ -0,0 +1,5 @@
+
+# Remove SCTP support at compilation
+set(CTEST_BUILD_OPTIONS "-DDISABLE_SCTP:BOOL=ON")
+
+set(CTEST_BUILD_NAME "No SCTP")
--- a/contrib/nightly_tests/runtests.sh	Tue Jun 29 16:08:08 2010 +0900
+++ b/contrib/nightly_tests/runtests.sh	Tue Jun 29 16:21:14 2010 +0900
@@ -5,7 +5,7 @@
 
 ROOTDIR=$HOME/fDtests
 if [ ! -d $ROOTDIR ]; then
-   echo "The working directory $ROOTDIR does not exist. Please create or edit the script."
+   echo "The working directory $ROOTDIR does not exist. Please create it or edit the script."
    exit 1;
 fi
 
@@ -21,9 +21,12 @@
    exit 1;
 fi
 
-# Now, cleanup any previous data. We start from clean slate.
-rm -rf $WORKDIR
-mkdir $WORKDIR
+# Now, cleanup any previous built data, but keep the sources (to get the diffs)
+if [ ! -d $WORKDIR ]; then 
+   mkdir $WORKDIR
+else
+   rm -rf $WORKDIR/*/build
+if
 
 echo "Starting Nightly tests, time: "`date`
 
@@ -48,13 +51,13 @@
    
    #### Create the script
    
-   # Project name, ...
+   # Project name, nightly time
    cp $WORKDIR/1_default.cmake $WORKDIR/$t/CTestScript.cmake
    
-   # Path name, build configuration, ...
+   # Create path names, default build configuration, ...
    cat >> $WORKDIR/$t/CTestScript.cmake << EOF
       ##########################
-      SET(CTEST_SOURCE_DIRECTORY "$ROOTDIR/source")
+      SET(CTEST_SOURCE_DIRECTORY "$WORKDIR/$t/source")
       SET(CTEST_BINARY_DIRECTORY "$WORKDIR/$t/build")
 
       set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
@@ -82,7 +85,7 @@
    cat >> $WORKDIR/$t/CTestScript.cmake << EOF
        #######################################################################
 
-       ctest_empty_binary_directory(\${CTEST_BINARY_DIRECTORY})
+       # ctest_empty_binary_directory(\${CTEST_BINARY_DIRECTORY})
 
        find_program(CTEST_HG_COMMAND NAMES hg)
        find_program(CTEST_COVERAGE_COMMAND NAMES gcov)
--- a/contrib/nightly_tests/tests.list	Tue Jun 29 16:08:08 2010 +0900
+++ b/contrib/nightly_tests/tests.list	Tue Jun 29 16:21:14 2010 +0900
@@ -1,4 +1,4 @@
 alldefault
+nosctp
 #noext
 #allext
-#nosctp
"Welcome to our mercurial repository"