Merge pull request #1758 from alexmiller-apple/external-workload

Fix ExternalWorkload not being a part of the old build/test system.

cmake/AddFdbTest.cmake

@@ -123,6 +123,8 @@ function(add_fdb_test)
     ${ADD_FDB_TEST_TEST_FILES}
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
 	get_filename_component(test_dir_full ${first_file} DIRECTORY)
-	get_filename_component(test_dir ${test_dir_full} NAME)
-	set_tests_properties(${test_name} PROPERTIES TIMEOUT ${this_test_timeout} LABELS "${test_dir}")
+	if(NOT ${test_dir_full} STREQUAL "")
+		get_filename_component(test_dir ${test_dir_full} NAME)
+		set_tests_properties(${test_name} PROPERTIES TIMEOUT ${this_test_timeout} LABELS "${test_dir}")
+	endif()
 endfunction()

fdbserver/fdbserver.vcxproj

@@ -157,6 +157,7 @@
     <ActorCompiler Include="workloads\DiskDurability.actor.cpp" />
     <ActorCompiler Include="workloads\SnapTest.actor.cpp" />
     <ActorCompiler Include="workloads\Mako.actor.cpp" />
+    <ActorCompiler Include="workloads\ExternalWorkload.actor.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ApplyMetadataMutation.h" />

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

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)