Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run ADIOS2 CI without test reruns #4098

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/ci/cmake/ci-common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ if(POLICY CMP0057)
endif()

if(NOT CTEST_BUILD_CONFIGURATION)
set(CTEST_BUILD_CONFIGURATION Debug)
set(CTEST_BUILD_CONFIGURATION Release)
endif()

if(NOT DEFINED NCPUS)
Expand Down
4 changes: 3 additions & 1 deletion scripts/dashboard/adios_common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
# set(ENV{FC} /path/to/fc) # Fortran compiler (optional)
# set(ENV{LD_LIBRARY_PATH} /path/to/vendor/lib) # (if necessary)

set(CTEST_CONFIGURATION_TYPE Release)

set(CTEST_PROJECT_NAME "ADIOS2")
set(CTEST_DROP_SITE "open.cdash.org")
if(NOT dashboard_git_url)
Expand Down Expand Up @@ -91,7 +93,7 @@ endif()
if((CMAKE_VERSION VERSION_GREATER 3.16.20191201 ) AND
(ADIOS_TEST_REPEAT GREATER 0) AND
NOT "REPEAT" IN_LIST CTEST_TEST_ARGS)
list(APPEND CTEST_TEST_ARGS REPEAT "UNTIL_PASS:${ADIOS_TEST_REPEAT}")
list(APPEND CTEST_TEST_ARGS REPEAT "UNTIL_FAIL:${ADIOS_TEST_REPEAT}")
endif()

list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
Expand Down
13 changes: 7 additions & 6 deletions testing/adios2/engine/bp/TestBPAccuracyDefaults.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ TEST_F(AccuracyTests, DefaultAccuracy)
bpWriter.Close();

auto accuracyGot = var.GetAccuracy();
assert(accuracyGot.error == 0.0); // no error whatsoever
assert(accuracyGot.norm == accuracyRequested.norm);
assert(accuracyGot.relative == accuracyRequested.relative);
EXPECT_EQ(accuracyGot.error, 0.0); // no error whatsoever
EXPECT_EQ(accuracyGot.norm, accuracyRequested.norm);
EXPECT_EQ(accuracyGot.relative, accuracyRequested.relative);
}
// Reader
{
Expand All @@ -100,9 +100,10 @@ TEST_F(AccuracyTests, DefaultAccuracy)
bpReader.PerformGets();

auto accuracyGot = varRange.GetAccuracy();
assert(accuracyGot.error == 0.0); // no error whatsoever
assert(accuracyGot.norm == accuracyRequested.norm);
assert(accuracyGot.relative == accuracyRequested.relative);
EXPECT_EQ(accuracyGot.error, 0.0); // no error whatsoever
EXPECT_EQ(accuracyGot.error, 0.0); // no error whatsoever
EXPECT_EQ(accuracyGot.norm, accuracyRequested.norm);
EXPECT_EQ(accuracyGot.relative, accuracyRequested.relative);

std::vector<int64_t> iStartEndData;
iStartEndData.reserve(gNx); // maximum possible
Expand Down
Loading