Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
tbeltzun committed Oct 12, 2023
1 parent 7bbad8d commit cfdfabf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion integratedTests
Submodule integratedTests updated 370 files
5 changes: 2 additions & 3 deletions scripts/ci_build_and_test_in_container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/coreComponents/unitTests/toolchain/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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")
Expand Down

0 comments on commit cfdfabf

Please sign in to comment.