Task #9893: Fixed tests after merge (install share/etc files using lofar...

Task #9893: Fixed tests after merge (install share/etc files using lofar macros, fix location of outputProc in tests)

MAC/Deployment/data/StaticMetaData/CMakeLists.txt

@@ -5,24 +5,24 @@ lofar_package(StaticMetaData 1.0)
 lofar_add_sbin_scripts(createFiles)
 
 # These files end up in ${prefix}/etc
-file(GLOB sysconf_data *.conf)
-install(FILES
+file(GLOB sysconf_data RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.conf)
+lofar_add_sysconf_files(
   ${sysconf_data}
   StationInfo.dat
-  ControlInfo.dat
-  DESTINATION etc)
+  ControlInfo.dat)
 
 # These files end up in ${prefix}/etc/StaticMetaData
-file(GLOB staticmeta_data 
-  *.tmpl 
-  *.test 
-  *.dat 
-  AntennaArrays/*.conf*
-  AntennaPos/*.conf*
-  CableDelays/*.conf*
-  iHBADeltas/*.conf*
-  AntennaFields/*.conf*
-  Attenuation/*.conf*)
-install(FILES
-  ${staticmeta_data}
-  DESTINATION etc/StaticMetaData)
+# lofar_add_sysconf_files can only install in the same
+# relative dir as in the source, hence we've put a symlink
+# StaticMetaData -> . in this directory.
+file(GLOB staticmeta_data RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+  StaticMetaData/*.tmpl 
+  StaticMetaData/*.test 
+  StaticMetaData/*.dat 
+  StaticMetaData/AntennaArrays/*.conf*
+  StaticMetaData/AntennaPos/*.conf*
+  StaticMetaData/CableDelays/*.conf*
+  StaticMetaData/iHBADeltas/*.conf*
+  StaticMetaData/AntennaFields/*.conf*
+  StaticMetaData/Attenuation/*.conf*)
+lofar_add_sysconf_files(${staticmeta_data})

RTCP/Cobalt/GPUProc/etc/CMakeLists.txt

@@ -14,10 +14,15 @@ configure_file(
 
 # List of default/ config parsets:
 # CMake cannot detect changes in this list, but for these files it doesn't need to.
-file(GLOB _config_parsets
-  "parset-additions.d/default/*.parset"
-  "${CMAKE_CURRENT_BINARY_DIR}/parset-additions.d/default/*.parset")   # configured .parset.in
-install(FILES ${_config_parsets} DESTINATION etc/parset-additions.d/default)
+file(GLOB _config_parsets_src RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "parset-additions.d/default/*.parset")
+file(GLOB _config_parsets_bin RELATIVE "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/parset-additions.d/default/*.parset")   # configured .parset.in
+
+lofar_add_sysconf_files(${_config_parsets_src})
+
+# cannot yet use lofar_add_sysconf_files since that wants to make a symlink to the source dir,
+# but we've build them there directly.
+install(FILES ${_config_parsets_bin} DESTINATION etc/parset-additions.d/default)
+#lofar_add_sysconf_files(${_config_parsets_bin})
 
 # Install script to generate StationStreams.parset for the live test system.
 lofar_add_sbin_scripts(parset-additions.d/default/generateStationStreams.sh)

RTCP/Cobalt/GPUProc/src/scripts/runObservation.sh

@@ -364,7 +364,7 @@ echo "[outputProc] pid file = $PID_LIST_FILE"
 touch $PID_LIST_FILE
 
 # Construct full command line for outputProc
-OUTPUTPROC_CMDLINE="source $OUTPUTPROC_ROOT/lofarinit.sh; export QUEUE_PREFIX=$QUEUE_PREFIX LOFARENV=$LOFARENV; numactl --cpunodebind=0 --preferred=0 outputProc $OBSERVATIONID"
+OUTPUTPROC_CMDLINE="source $OUTPUTPROC_ROOT/lofarinit.sh; export QUEUE_PREFIX=$QUEUE_PREFIX LOFARENV=$LOFARENV; numactl --cpunodebind=0 --preferred=0 $OUTPUTPROC_ROOT/bin/outputProc $OBSERVATIONID"
 
 # Wrap command line with Docker if required
 if $DOCKER; then