apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-27 18:37:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
Andrew Noyes 2021-01-25 18:57:12 +00:00
parent adde95bea5
commit 6a40b007e6
1 changed files with 0 additions and 3 deletions

3
tests/CMakeLists.txt

@ -79,11 +79,8 @@ if(WITH_PYTHON)
add_fdb_test(TEST_FILES SampleNoSimAttrition.txt IGNORE)
if (NOT USE_UBSAN) # TODO re-enable in UBSAN after https://github.com/apple/foundationdb/issues/2410 is resolved
add_fdb_test(TEST_FILES SimpleExternalTest.txt)
<<<<<<< HEAD
else()
add_fdb_test(TEST_FILES SimpleExternalTest.txt IGNORE)
=======
>>>>>>> release-6.3
endif()
add_fdb_test(TEST_FILES SlowTask.txt IGNORE)
add_fdb_test(TEST_FILES SpecificUnitTest.txt IGNORE)