From 83fae6cc15a1da9b898d8b842811493abede76a3 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Tue, 25 Jun 2019 21:41:43 -0700 Subject: [PATCH] Fix ExternalWorkload not being a part of the old build/test system. --- fdbserver/fdbserver.vcxproj | 1 + fdbserver/workloads/ExternalWorkload.actor.cpp | 2 +- tests/CMakeLists.txt | 2 +- tests/{fast => }/SimpleExternalTest.txt | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename tests/{fast => }/SimpleExternalTest.txt (100%) diff --git a/fdbserver/fdbserver.vcxproj b/fdbserver/fdbserver.vcxproj index 44e752cdb3..2dd4cb17db 100644 --- a/fdbserver/fdbserver.vcxproj +++ b/fdbserver/fdbserver.vcxproj @@ -157,6 +157,7 @@ + diff --git a/fdbserver/workloads/ExternalWorkload.actor.cpp b/fdbserver/workloads/ExternalWorkload.actor.cpp index c967bc1655..69715def42 100644 --- a/fdbserver/workloads/ExternalWorkload.actor.cpp +++ b/fdbserver/workloads/ExternalWorkload.actor.cpp @@ -21,7 +21,7 @@ #include "flow/ThreadHelper.actor.h" #include "flow/Platform.h" #include "fdbclient/ThreadSafeTransaction.h" -#include "foundationdb/ClientWorkload.h" +#include "bindings/c/foundationdb/ClientWorkload.h" #include "fdbserver/workloads/workloads.actor.h" #include "flow/actorcompiler.h" // has to be last include diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 80ef93456a..c90fc36ceb 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -63,6 +63,7 @@ add_fdb_test(TEST_FILES ReadAbsent.txt IGNORE) add_fdb_test(TEST_FILES ReadHalfAbsent.txt IGNORE) add_fdb_test(TEST_FILES RedwoodCorrectness.txt IGNORE) add_fdb_test(TEST_FILES RedwoodPerfTests.txt IGNORE) +add_fdb_test(TEST_FILES SimpleExternalTest.txt) add_fdb_test(TEST_FILES SlowTask.txt IGNORE) add_fdb_test(TEST_FILES SpecificUnitTest.txt IGNORE) add_fdb_test(TEST_FILES StreamingWrite.txt IGNORE) @@ -109,7 +110,6 @@ add_fdb_test(TEST_FILES fast/RandomUnitTests.txt) add_fdb_test(TEST_FILES fast/SelectorCorrectness.txt) add_fdb_test(TEST_FILES fast/Sideband.txt) add_fdb_test(TEST_FILES fast/SidebandWithStatus.txt) -add_fdb_test(TEST_FILES fast/SimpleExternalTest.txt) add_fdb_test(TEST_FILES fast/SnapTestFailAndDisablePop.txt) add_fdb_test(TEST_FILES fast/SwizzledRollbackSideband.txt) add_fdb_test(TEST_FILES fast/SystemRebootTestCycle.txt) diff --git a/tests/fast/SimpleExternalTest.txt b/tests/SimpleExternalTest.txt similarity index 100% rename from tests/fast/SimpleExternalTest.txt rename to tests/SimpleExternalTest.txt