Task #11004: Reintegrated task branch LOFAR-DAS5-Task11004 (Adding das5...

Task #11004:  Reintegrated task branch LOFAR-DAS5-Task11004 (Adding das5 variants file, fixing two env variables and checking for qpid in tests relying on it) into the trunk

.gitattributes

@@ -1765,6 +1765,7 @@ CMake/variants/variants.cbt010 -text
 CMake/variants/variants.dop282 -text
 CMake/variants/variants.dop320 -text
 CMake/variants/variants.dragproc -text
+CMake/variants/variants.fs5 -text
 CMake/variants/variants.head01 -text
 CMake/variants/variants.lcs157 -text
 CMake/variants/variants.lexar -text

CEP/DP3/DPPP_AOFlag/test/tAOFlaggerStep.run

@@ -3,8 +3,8 @@
 # Define the path for finding the library.
 #LD_LIBRARY_PATH=../src:/Users/diepen/external/lib:$LD_LIBRARYPATH
 #DYLD_LIBRARY_PATH=../src:/Users/diepen/external/lib:$DYLD_LIBRARYPATH
-LD_LIBRARY_PATH=../src:$LD_LIBRARYPATH
-DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARYPATH
+LD_LIBRARY_PATH=../src:$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH
 echo $LD_LIBRARY_PATH

CEP/DP3/PythonDPPP/test/tPythonStep.run

@@ -14,8 +14,8 @@ tar zxf $srcdir/../../DPPP/test/tNDPPP.in_MS.tgz
 mv tNDPPP_tmp.MS tPythonStep_tmp.MS
 
 # Define the path for finding the library.
-LD_LIBRARY_PATH=../src:$LD_LIBRARYPATH
-DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARYPATH
+LD_LIBRARY_PATH=../src:$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH
 

CEP/DP3/TestDynDPPP/test/tTestDynStep.run

 #!/bin/sh
 
 # Define the path for finding the library.
-LD_LIBRARY_PATH=../src:$LD_LIBRARYPATH
-DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARYPATH
+LD_LIBRARY_PATH=../src:$LD_LIBRARY_PATH
+DYLD_LIBRARY_PATH=../src:$DYLD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH
 

CMake/variants/variants.fs5

+# Definitions file for DAS5 compiler suite.
+#
+# Compiler suite
+set(LOFAR_COMPILER_SUITES GNU)
+
+# Build variants
+set(LOFAR_BUILD_VARIANTS DEBUG OPT OPT3 OPTARCH)
+
+# After loading the right gcc version module (not tested with other compilers)
+if(NOT (DEFINED ENV{CC} AND DEFINED ENV{CXX} AND DEFINED ENV{FC}))
+   message(FATAL_ERROR "CC, CXX and FC environment variables are required. Have you loaded the compile module?")
+endif()
+
+set(GNU_COMPILERS GNU_C GNU_CXX GNU_Fortran GNU_ASM)
+set(GNU_C         $ENV{CC}  )      # C compiler
+set(GNU_CXX       $ENV{CXX} )      # C++ compiler
+set(GNU_Fortran   $ENV{FC}  )      # Fortran compiler
+set(GNU_ASM       $ENV{CC}  )      # assembler
+
+message(WARNING "Building using fs5 variants file. Compilers picked based on environment variables, flags are based on directory name (e.g. gnu_opt assumes gnu compiler suite). This could be inconsistent and cause problems.")
+
+# if(NOT ENV{FOO_HOME})
+#   message(FATAL_ERROR "Could not find FOO_HOME environment variable")
+#   endif(NOT ENV{FOO_HOME}))
+#
+#
+#
+# DAS5 specific settings
+option(USE_QPID         "Use Qpid"            OFF)
+option(USE_OPENMP       "Use OpenMP"           ON)
+set(WCSLIB_ROOT_DIR     $ENV{WCSLIB_ROOT_DIR}    )
+set(CFITSIO_ROOT_DIR    $ENV{CFITSIO_ROOT_DIR}   )
+set(CASAREST_ROOT_DIR   $ENV{CASAREST_ROOT_DIR}  )
+set(CASACORE_ROOT_DIR   $ENV{CASACORE_ROOT_DIR}  )
+set(LOG4CPLUS_ROOT_DIR  $ENV{LOG4CPLUS_ROOT_DIR} )
+set(PYTHON_BDSF         $ENV{PYBDSF_ROOT_DIR}    )
+set(AOFLAGGER_ROOT_DIR  $ENV{AOFLAGGER_ROOT_DIR} )
+
+set(GNU_C_FLAGS          "-W -Wall -Wno-unknown-pragmas")
+set(GNU_C_FLAGS_DEBUG    "-g")
+set(GNU_C_FLAGS_OPT      "-g -O2")
+set(GNU_C_FLAGS_OPT3     "-g -O3")
+set(GNU_C_FLAGS_OPTARCH  "-g -O3 -march=native")
+set(GNU_CXX_FLAGS        "-W -Wall -Woverloaded-virtual -Wno-unknown-pragmas")
+set(GNU_CXX_FLAGS_DEBUG  "-g")
+set(GNU_CXX_FLAGS_OPT    "-g -O2")
+set(GNU_CXX_FLAGS_OPT3   "-g -O3")
+set(GNU_CXX_FLAGS_OPTARCH "-g -O3 -march=native")
+set(GNU_EXE_LINKER_FLAGS)
+set(GNU_EXE_LINKER_FLAGS_DEBUG)
+set(GNU_EXE_LINKER_FLAGS_OPT)
+set(GNU_EXE_LINKER_FLAGS_OPT3)
+set(GNU_EXE_LINKER_FLAGS_OPTARCH)
+set(GNU_SHARED_LINKER_FLAGS)
+set(GNU_SHARED_LINKER_FLAGS_DEBUG)
+set(GNU_SHARED_LINKER_FLAGS_OPT)
+set(GNU_SHARED_LINKER_FLAGS_OPT3)
+set(GNU_SHARED_LINKER_FLAGS_OPTARCH)
+set(GNU_COMPILE_DEFINITIONS)
+set(GNU_COMPILE_DEFINITIONS_DEBUG 
+                         "-DLOFAR_DEBUG -DENABLE_DBGASSERT -DENABLE_TRACER")
+set(GNU_COMPILE_DEFINITIONS_OPT)
+set(GNU_COMPILE_DEFINITIONS_OPT3
+                         "-DNDEBUG -DDISABLE_DEBUG_OUTPUT")
+set(GNU_COMPILE_DEFINITIONS_OPTARCH
+                         "-DNDEBUG -DDISABLE_DEBUG_OUTPUT")
+

LCS/Messaging/python/messaging/test/CMakeLists.txt

@@ -2,7 +2,18 @@
 
 include(LofarCTest)
 
-lofar_add_test(t_messages)
-lofar_add_test(t_messagebus)
-lofar_add_test(t_RPC)
-lofar_add_test(t_service_message_handler)
+set(_qpid_tests
+    t_messages
+    t_messagebus
+    t_RPC
+    t_service_message_handler)
+
+if(HAVE_QPID)
+ foreach(_test ${_qpid_tests})
+   lofar_add_test(${_test})
+ endforeach()
+else()
+  lofar_join_arguments(_qpid_tests)
+  message(WARNING "Qpid is not set."
+    "The following tests will not be run: ${_qpid_tests}")
+endif()

SAS/OTDB_Services/test/CMakeLists.txt

@@ -4,6 +4,16 @@ include(LofarCTest)
 
 lofar_find_package(Python REQUIRED)
 
-lofar_add_test(t_TreeService)
-lofar_add_test(t_TreeStatusEvents)
+set(_qpid_tests
+    t_TreeService
+    t_TreeStatusEvents)
 
+if(HAVE_QPID)
+ foreach(_test ${_qpid_tests})
+   lofar_add_test(${_test})
+ endforeach()
+else()
+  lofar_join_arguments(_qpid_tests)
+  message(WARNING "Qpid is not set."
+    "The following tests will not be run: ${_qpid_tests}")
+endif()