diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-14 22:33:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 22:33:52 +0200 |
| commit | 16c853fc08aaf83b849c4e1c3f7dc9a4af5dba0b (patch) | |
| tree | 424dff2bb29e39a47af168d8945a9e627636cd8c | |
| parent | 0a639e417a35f826a18d09900c5c03f5c9c62e04 (diff) | |
| parent | e46eb444902f273a93effdb070c86a315e871d45 (diff) | |
Merge pull request #12914 from vespa-engine/toregge/disable-some-unit-tests-on-darwin
Disable some unit tests on Darwin.
| -rw-r--r-- | staging_vespalib/CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/staging_vespalib/CMakeLists.txt b/staging_vespalib/CMakeLists.txt index e76d3078630..f2f8a41b68d 100644 --- a/staging_vespalib/CMakeLists.txt +++ b/staging_vespalib/CMakeLists.txt @@ -1,4 +1,9 @@ # Copyright 2017 Yahoo Holdings. 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(STAGING_VESPALIB_DIRECTIO_TESTDIR src/tests/directio) +set(STAGING_VESPALIB_PROCESS_MEMORY_STATS_TESTDIR src/tests/util/process_memory_stats) +endif() + vespa_define_module( DEPENDS fastos @@ -12,7 +17,7 @@ vespa_define_module( src/tests/bits src/tests/clock src/tests/crc - src/tests/directio + ${STAGING_VESPALIB_DIRECTIO_TESTDIR} src/tests/encoding/base64 src/tests/fileheader src/tests/floatingpointtype @@ -33,7 +38,7 @@ vespa_define_module( src/tests/sequencedtaskexecutor src/tests/singleexecutor src/tests/timer - src/tests/util/process_memory_stats + ${STAGING_VESPALIB_PROCESS_MEMORY_STATS_TESTDIR} src/tests/xmlserializable LIBS |