From 3623b28df51b8e5f05321a386ca8e9aa8c806173 Mon Sep 17 00:00:00 2001 From: Evan Tschannen Date: Wed, 29 Jul 2020 00:36:12 -0700 Subject: [PATCH] fixed merge conflict --- tests/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a0b79c423f..bff90cb139 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -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)