Mercurial > hg > freeDiameter
changeset 347:69ec5dcc1fb2
Fix a couple of glinches
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Tue, 29 Jun 2010 16:08:08 +0900 |
| parents | bb470dce2276 |
| children | d978dd58a1d9 |
| files | contrib/nightly_tests/README contrib/nightly_tests/alldefault.conf contrib/nightly_tests/runtests.sh |
| diffstat | 3 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/nightly_tests/README Tue Jun 29 15:56:05 2010 +0900 +++ b/contrib/nightly_tests/README Tue Jun 29 16:08:08 2010 +0900 @@ -15,7 +15,7 @@ 2) Create a directory ~/fDtests $ cd -$ make fDtests +$ mkdir fDtests $ cd fDtests 3) Retrieve the runtests.sh script and save in this directory
--- a/contrib/nightly_tests/alldefault.conf Tue Jun 29 15:56:05 2010 +0900 +++ b/contrib/nightly_tests/alldefault.conf Tue Jun 29 16:08:08 2010 +0900 @@ -2,4 +2,4 @@ # Do not pass any parameter to cmake set(CTEST_BUILD_OPTIONS "") -set(CTEST_BUILD_NAME "Default CMake options") +set(CTEST_BUILD_NAME "Default")
--- a/contrib/nightly_tests/runtests.sh Tue Jun 29 15:56:05 2010 +0900 +++ b/contrib/nightly_tests/runtests.sh Tue Jun 29 16:08:08 2010 +0900 @@ -16,7 +16,8 @@ # the name of the build slave. # Exemple: SET(CTEST_SITE "Ubuntu-Lucid-64b") if [ ! -e $ROOTDIR/local.cmake ]; then - echo "Missing $ROOTDIR/local.cmake file"; + echo "Missing $ROOTDIR/local.cmake file, generating one (edit as needed, and run the script again)"; + echo "SET(CTEST_SITE \""`hostname --fqdn`"\")" > $ROOTDIR/local.cmake exit 1; fi @@ -53,17 +54,18 @@ # Path name, build configuration, ... cat >> $WORKDIR/$t/CTestScript.cmake << EOF ########################## - SET(CTEST_SOURCE_DIRECTORY "$WORKDIR/source") + SET(CTEST_SOURCE_DIRECTORY "$ROOTDIR/source") SET(CTEST_BINARY_DIRECTORY "$WORKDIR/$t/build") set(CTEST_CMAKE_GENERATOR "Unix Makefiles") + set(CTEST_BUILD_CONFIGURATION "Profiling") - - set(CTEST_BUILD_OPTIONS "") - set(CTEST_BUILD_NAME "Unamed test profile") - set(WITH_MEMCHECK FALSE) set(WITH_COVERAGE TRUE) + + set(CTEST_BUILD_OPTIONS "") + set(CTEST_BUILD_NAME "Unamed") + ########################## EOF