Fold staging_vespalib into vespalib

1 files changed, 24 insertions, 1 deletions

diff --git a/vespalib/CMakeLists.txt b/vespalib/CMakeLists.txt
index 79cc32d2a60..fd1c52a868a 100644
--- a/vespalib/CMakeLists.txt
+++ b/vespalib/CMakeLists.txt
@@ -1,4 +1,9 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+set(VESPALIB_DIRECTIO_TESTDIR src/tests/directio)
+set(VESPALIB_PROCESS_MEMORY_STATS_TESTDIR src/tests/util/process_memory_stats)
+endif()
+
 vespa_define_module(
     DEPENDS
     fastos
@@ -25,16 +30,20 @@ vespa_define_module(
     src/tests/arrayref
     src/tests/assert
     src/tests/barrier
+    src/tests/benchmark
     src/tests/benchmark_timer
+    src/tests/bits
     src/tests/box
     src/tests/btree
     src/tests/btree/btree_store
     src/tests/btree/btree-scan-speed
     src/tests/btree/btree-stress
+    src/tests/clock
     src/tests/component
     src/tests/compress
     src/tests/compression
     src/tests/cpu_usage
+    src/tests/crc
     src/tests/crypto
     src/tests/data/databuffer
     src/tests/data/input_reader
@@ -53,6 +62,7 @@ vespa_define_module(
     src/tests/datastore/unique_store
     src/tests/datastore/unique_store_dictionary
     src/tests/datastore/unique_store_string_allocator
+    ${VESPALIB_DIRECTIO_TESTDIR}
     src/tests/detect_type_benchmark
     src/tests/dotproduct
     src/tests/drop-file-from-cache
@@ -63,21 +73,25 @@ vespa_define_module(
     src/tests/executor
     src/tests/executor_idle_tracking
     src/tests/explore_modern_cpp
-    src/tests/fileheader
     src/tests/false
     src/tests/fiddle
+    src/tests/fileheader
+    src/tests/floatingpointtype
     src/tests/fuzzy
     src/tests/gencnt
+    src/tests/growablebytebuffer
     src/tests/guard
     src/tests/host_name
     src/tests/hwaccelrated
     src/tests/io/fileutil
     src/tests/io/mapped_file_input
     src/tests/issue
+    src/tests/json
     src/tests/latch
     src/tests/left_right_heap
     src/tests/make_fixture_macros
     src/tests/memory
+    src/tests/memorydatastore
     src/tests/metrics
     src/tests/net/async_resolver
     src/tests/net/crypto_socket
@@ -93,9 +107,13 @@ vespa_define_module(
     src/tests/net/tls/protocol_snooping
     src/tests/net/tls/transport_options
     src/tests/nice
+    src/tests/objects/identifiable
     src/tests/objects/nbostream
+    src/tests/objects/objectdump
+    src/tests/objects/objectselection
     src/tests/optimized
     src/tests/overload
+    src/tests/polymorphicarray
     src/tests/portal
     src/tests/portal/handle_manager
     src/tests/portal/http_request
@@ -103,13 +121,17 @@ vespa_define_module(
     src/tests/printable
     src/tests/priority_queue
     src/tests/process
+    ${VESPALIB_PROCESS_MEMORY_STATS_TESTDIR}
+    src/tests/programoptions
     src/tests/random
     src/tests/referencecounter
     src/tests/regex
     src/tests/rendezvous
     src/tests/require
     src/tests/runnable_pair
+    src/tests/rusage
     src/tests/sequencedtaskexecutor
+    src/tests/shutdownguard
     src/tests/singleexecutor
     src/tests/sha1
     src/tests/shared_operation_throttler
@@ -169,6 +191,7 @@ vespa_define_module(
     src/tests/visit_ranges
     src/tests/invokeservice
     src/tests/wakeup
+    src/tests/xmlserializable
     src/tests/zcurve
 
     LIBS