fixed merge conflict

This commit is contained in:
Evan Tschannen 2020-07-29 00:36:12 -07:00
parent a49cb41de7
commit 3623b28df5
1 changed files with 2 additions and 2 deletions

View File

@ -194,8 +194,8 @@ if(WITH_PYTHON)
TEST_FILES restarting/from_5.2.0/ClientTransactionProfilingCorrectness-1.txt
restarting/from_5.2.0/ClientTransactionProfilingCorrectness-2.txt)
add_fdb_test(
TEST_FILES restarting/CycleTestRestart-1.txt
restarting/CycleTestRestart-2.txt)
TEST_FILES restarting/to_6.3.5/CycleTestRestart-1.txt
restarting/to_6.3.5/CycleTestRestart-2.txt)
add_fdb_test(TEST_FILES slow/ApiCorrectness.toml)
add_fdb_test(TEST_FILES slow/ApiCorrectnessAtomicRestore.toml)
add_fdb_test(TEST_FILES slow/ApiCorrectnessSwitchover.toml)