diff --git a/CMakeLists.txt b/CMakeLists.txt index 91a9dc4..46f799d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,29 +90,27 @@ enable_testing() set(TESTDIR ${CMAKE_CURRENT_SOURCE_DIR}/src/test) subdirlist(TEST_CATEGORIES ${TESTDIR}) -foreach(TEST_CACHE_FRIENDLY_OFFSET OFF;ON) - foreach(SUPER_SLAB_SIZE 1;16) - foreach(TEST_CATEGORY ${TEST_CATEGORIES}) - subdirlist(TESTS ${TESTDIR}/${TEST_CATEGORY}) - foreach(TEST ${TESTS}) - unset(SRC) - aux_source_directory(${TESTDIR}/${TEST_CATEGORY}/${TEST} SRC) - set(TESTNAME "${TEST_CATEGORY}-${TEST}-${SUPER_SLAB_SIZE}") - if (TEST_CACHE_FRIENDLY_OFFSET) - set(TESTNAME "${TESTNAME}-cache-friendly") - endif() +foreach(TEST_CATEGORY ${TEST_CATEGORIES}) + subdirlist(TESTS ${TESTDIR}/${TEST_CATEGORY}) + foreach(TEST ${TESTS}) + foreach(SUPER_SLAB_SIZE 1;16) + unset(SRC) + aux_source_directory(${TESTDIR}/${TEST_CATEGORY}/${TEST} SRC) + set(TESTNAME "${TEST_CATEGORY}-${TEST}-${SUPER_SLAB_SIZE}") - add_executable(${TESTNAME} ${SRC} src/override/new.cc) - if (${SUPER_SLAB_SIZE} EQUAL 1) - target_compile_definitions(${TESTNAME} PRIVATE IS_ADDRESS_SPACE_CONSTRAINED) - endif() - if(TEST_CACHE_FRIENDLY_OFFSET) - target_compile_definitions(${TESTNAME} PRIVATE CACHE_FRIENDLY_OFFSET=64) - endif() - target_include_directories(${TESTNAME} PRIVATE src) - linklibs(${TESTNAME}) + add_executable(${TESTNAME} ${SRC} src/override/new.cc) + if (${SUPER_SLAB_SIZE} EQUAL 1) + target_compile_definitions(${TESTNAME} PRIVATE IS_ADDRESS_SPACE_CONSTRAINED) + endif() + target_include_directories(${TESTNAME} PRIVATE src) + linklibs(${TESTNAME}) + if (${TEST} MATCHES "release-.*") + message(STATUS "Adding test: ${TESTNAME} only for release configs") + add_test(NAME ${TESTNAME} COMMAND ${TESTNAME} CONFIGURATIONS "Release") + else() + message(STATUS "Adding test: ${TESTNAME}") add_test(${TESTNAME} ${TESTNAME}) - endforeach() + endif() endforeach() endforeach() endforeach() diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8573b95..be38766 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,7 +42,7 @@ phases: displayName: 'Compile' - script: | - ctest -j 4 --output-on-failure + ctest -j 4 --output-on-failure -C $(BuildType) workingDirectory: build failOnStderr: true @@ -81,7 +81,7 @@ phases: solution: build/snmalloc.sln msbuildArguments: '/m /p:Configuration=$(BuildType)' - - script: 'ctest -j 4 --interactive-debug-mode 0 --output-on-failure' + - script: 'ctest -j 4 --interactive-debug-mode 0 --output-on-failure -C $(BuildType)' workingDirectory: build displayName: 'Run Ctest' @@ -105,7 +105,7 @@ phases: solution: build/snmalloc.sln msbuildArguments: '/m /p:Configuration=$(BuildType)' - - script: 'ctest -j 4 --interactive-debug-mode 0 --output-on-failure' + - script: 'ctest -j 4 --interactive-debug-mode 0 --output-on-failure -C $(BuildType)' workingDirectory: build displayName: 'Run Ctest' @@ -131,7 +131,7 @@ phases: solution: build/snmalloc.sln msbuildArguments: '/m /p:Configuration=$(BuildType)' - - script: 'ctest -j 4 --interactive-debug-mode 0 --output-on-failure' + - script: 'ctest -j 4 --interactive-debug-mode 0 --output-on-failure -C $(BuildType)' workingDirectory: build displayName: 'Run Ctest' @@ -159,7 +159,7 @@ phases: displayName: 'Compile' - script: | - ctest -j 4 --output-on-failure + ctest -j 4 --output-on-failure -C $(BuildType) workingDirectory: build failOnStderr: true diff --git a/src/test/func/rounding/rounding.cc b/src/test/func/release-rounding/rounding.cc similarity index 100% rename from src/test/func/rounding/rounding.cc rename to src/test/func/release-rounding/rounding.cc