From cfdfabfc626181c7637c9047a637ed2b58c5594b Mon Sep 17 00:00:00 2001 From: tbeltzun <129868353+tbeltzun@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:24:28 +0200 Subject: [PATCH] cleanup --- integratedTests | 2 +- scripts/ci_build_and_test_in_container.sh | 5 ++--- src/coreComponents/unitTests/toolchain/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/integratedTests b/integratedTests index e82dce81954..7f2d88633c7 160000 --- a/integratedTests +++ b/integratedTests @@ -1 +1 @@ -Subproject commit e82dce81954e02d6f187a5b9b301df42fa26b928 +Subproject commit 7f2d88633c7f35528a49257f89bb11ae475c6e4c diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index e0c9f242966..4c3b8431b3b 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -62,7 +62,6 @@ or_die python3 scripts/config-build.py \ -bp ${GEOSX_BUILD_DIR} \ -ip ${GEOSX_DIR} \ --ninja \ - -DCMAKE_VERBOSE_MAKEFILE=1 \ -DBLT_MPI_COMMAND_APPEND='"--allow-run-as-root;--oversubscribe"' \ -DGEOSX_INSTALL_SCHEMA=${GEOSX_INSTALL_SCHEMA} @@ -83,9 +82,9 @@ fi # "Make" target check (builds geosx executable target only if true) # Use one process to prevent out-of-memory error if [[ "$*" == *--build-exe-only* ]]; then - or_die ninja -v -j $(nproc) geosx + or_die ninja -j $(nproc) geosx else - or_die ninja -v -j $(nproc) + or_die ninja -j $(nproc) or_die ninja install fi diff --git a/src/coreComponents/unitTests/toolchain/CMakeLists.txt b/src/coreComponents/unitTests/toolchain/CMakeLists.txt index e91d335a74e..657a74fc073 100644 --- a/src/coreComponents/unitTests/toolchain/CMakeLists.txt +++ b/src/coreComponents/unitTests/toolchain/CMakeLists.txt @@ -1,8 +1,7 @@ # Specify list of tests set( gtest_geosx_tests testNDEBUG.cpp ) - -# NOTE: we explicitly depend on internal libraries in order to to check for the spurious addition of -DNDEBUG flag +# NOTE: we explicitly depend on internal libraries in order to check for the spurious addition of -DNDEBUG flag set( dependencyList ${parallelDeps} gtest physicsSolvers discretizationMethods fieldSpecification linearAlgebra dataRepository events fileIO optionparser ) # Add gtest C++ based tests @@ -17,6 +16,7 @@ foreach(test ${gtest_geosx_tests}) blt_add_test( NAME ${test_name} COMMAND ${test_name} ) + # NOTE: we explicitly depend on internal headers in order to check for the spurious addition of -DNDEBUG flag target_include_directories( ${test_name} PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents ) if(CMAKE_BUILD_TYPE STREQUAL "Debug")