WIP:fix vol-tests build

mattjala · Jul 17, 2023 · e10471a · e10471a
1 parent 92c91c8
commit e10471a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/build_vol_cmake.sh b/build_vol_cmake.sh
@@ -197,12 +197,19 @@ CFLAGS="-D_POSIX_C_SOURCE=200809L" cmake -G "${CMAKE_GENERATOR}" -DCMAKE_INSTALL
 
 echo "Build files have been generated for CMake generator '${CMAKE_GENERATOR}'"
 
+mkdir -p "${BUILD_DIR}/tests/vol-tests"
 cd "${BUILD_DIR}/tests/vol-tests"
 
-CFLAGS="-D_POSIX_C_SOURCE=200809L" cmake -G "${CMAKE_GENERATOR}" -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" "${PREBUILT_HDF5_OPT}" "${CONNECTOR_DEBUG_OPT}" "${CURL_DEBUG_OPT}" "${MEM_TRACK_OPT}" "${THREAD_SAFE_OPT}" "${SCRIPT_DIR}/test/vol-tests"
+sudo CFLAGS="-D_POSIX_C_SOURCE=200809L" cmake -G "${CMAKE_GENERATOR}" -DHDF5_VOL_TEST_SERVER=XXXXXXXXXXX -DHDF5_DIR=${INSTALL_DIR} -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" "${PREBUILT_HDF5_OPT}" "${CONNECTOR_DEBUG_OPT}" "${CURL_DEBUG_OPT}" "${MEM_TRACK_OPT}" "${THREAD_SAFE_OPT}" "${SCRIPT_DIR}/test/vol-tests"
 
 echo "VOL tests built"
 
+cd "${BUILD_DIR}"
+
+# Build HDF5 first if not prebuilt
+cd "${BUILD_DIR}/hdf5"
+make -j${NPROCS} && make install || exit 1
+
 # Build with autotools make by default
 if [ "${CMAKE_GENERATOR}" = "Unix Makefiles" ]; then
   make -j${NPROCS} && make install || exit 1

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -27,7 +27,7 @@ if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/vol-tests/CMakeLists.txt)
   )
   message(STATUS ${GIT_SUBMODULE_UPDATE_OUTPUT})
 endif()
-add_subdirectory(vol-tests)
+#add_subdirectory(vol-tests)
 
 #-----------------------------------------------------------------------------
 # REST VOL specific tests