Merge branch 'experimental' into 'master'

Experimental

See merge request !3

cdash/common.cmake

@@ -16,13 +16,16 @@ set(CTEST_CONFIGURATION_TYPE ${CTEST_BUILD_CONFIGURATION})
 
 #---Set the source and build directory--------------------------------------
 set(CTEST_BUILD_PREFIX "$ENV{WORKDIR}")
-set(CTEST_SOURCE_DIRECTORY "${CTEST_BUILD_PREFIX}/${CTEST_BUILD_NAME}-source")
-set(CTEST_BINARY_DIRECTORY "${CTEST_BUILD_PREFIX}/${CTEST_BUILD_NAME}-build")
+#set(CTEST_SOURCE_DIRECTORY "${CTEST_BUILD_PREFIX}/${CTEST_BUILD_NAME}-source")
+#set(CTEST_BINARY_DIRECTORY "${CTEST_BUILD_PREFIX}/${CTEST_BUILD_NAME}-build")
+set(CTEST_SOURCE_DIRECTORY "${CTEST_BUILD_PREFIX}/source")
+set(CTEST_BINARY_DIRECTORY "${CTEST_BUILD_PREFIX}/build")
 
 #---Set the install directory----------------------------------------------- 
 # if $INSTALLDIR is given, use that one, otherwise derive from binary dir
 if("$ENV{INSTALLDIR}" STREQUAL "")
-  set(CTEST_INSTALL_DIRECTORY "${CTEST_BUILD_PREFIX}/${CTEST_BUILD_NAME}-install")
+#  set(CTEST_INSTALL_DIRECTORY "${CTEST_BUILD_PREFIX}/${CTEST_BUILD_NAME}-install")
+  set(CTEST_INSTALL_DIRECTORY "${CTEST_BUILD_PREFIX}/install")
 else()
   set(CTEST_INSTALL_DIRECTORY "$ENV{INSTALLDIR}")
 endif()

cdash/copy_to_afs.py

@@ -125,7 +125,7 @@ if __name__ == "__main__":
   compilerdir = compiler.split("bin")[0]
 
   # define source and target  
-  sourcedir = "%s/%s-install" %(workdir,platform)
+  sourcedir = "%s/install" %(workdir)
   targetdir = os.path.join(options.targetbase,slotname,today())
 
   # find out which directories to copy

cdash/isDone.sh

@@ -15,11 +15,15 @@ platform=`$this/getPlatform.py`
 today=$(date +%a)
 nightdir=/afs/cern.ch/sw/lcg/app/nightlies
 donefile=$nightdir/$SLOTNAME/$today/isDone-$platform
-
+unstabledonefile=$nightdir/$SLOTNAME/$today/isDone-unstable-$platform
 if [ $isdone == 1 ]; then
   touch $donefile
   echo "Created file $donefile"
+elif [ $isdone == 2 ]; then
+  touch $unstabledonefile
+  echo "Created file unstable-$donefile"
 else
   rm -f $donefile
-  echo "Removed file $donefile"
+  rm -f $unstabledonefile
+  echo "Removed file $donefile and $unstabledonefile"
 fi

cdash/jk-runbuild.sh

@@ -21,5 +21,14 @@ rm -rf /tmp/the.lock
 env | sort | sed 's/:/:?     /g' | tr '?' '\n'
 
 # do the build-----------------------------------------------------
-ctest -VV -S $THIS/lcgcmake-build.cmake
+ctest -VV -S $THIS/lcgcmake-build.cmake 
+
+if [ $? -eq 0 ]
+then
+  echo "Successfully created file"
+  exit 0
+else
+  echo "Could not create file" 
+  exit 1
+fi