diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-16 15:41:45 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-16 15:41:45 +0200 |
| commit | 11436ed76a25de36d36088efdf41a269492419bd (patch) | |
| tree | 06aa41e33e9966daff628d2d5bf78be2f63d3946 /vespamalloc | |
| parent | 3bf268db62f04f4381985ed996943e7d7c20c653 (diff) | |
| parent | 4846c77475562d91efda27df9249a69539868f43 (diff) | |
Merge branch 'master' into aressem/vespa-compile-on-centos7
Diffstat (limited to 'vespamalloc')
| -rw-r--r-- | vespamalloc/src/tests/doubledelete/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespamalloc/src/tests/overwrite/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespamalloc/src/tests/stacktrace/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespamalloc/src/tests/test1/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespamalloc/src/tests/test2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespamalloc/src/tests/thread/CMakeLists.txt | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/vespamalloc/src/tests/doubledelete/CMakeLists.txt b/vespamalloc/src/tests/doubledelete/CMakeLists.txt index e38f163148a..c687b7ab098 100644 --- a/vespamalloc/src/tests/doubledelete/CMakeLists.txt +++ b/vespamalloc/src/tests/doubledelete/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespamalloc_doubledelete_test_app +vespa_add_executable(vespamalloc_doubledelete_test_app TEST SOURCES doubledelete.cpp DEPENDS diff --git a/vespamalloc/src/tests/overwrite/CMakeLists.txt b/vespamalloc/src/tests/overwrite/CMakeLists.txt index f3625bd396c..7777c930669 100644 --- a/vespamalloc/src/tests/overwrite/CMakeLists.txt +++ b/vespamalloc/src/tests/overwrite/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespamalloc_overwrite_test_app +vespa_add_executable(vespamalloc_overwrite_test_app TEST SOURCES overwrite.cpp DEPENDS diff --git a/vespamalloc/src/tests/stacktrace/CMakeLists.txt b/vespamalloc/src/tests/stacktrace/CMakeLists.txt index 6d8fbfcbaa1..6aed633e918 100644 --- a/vespamalloc/src/tests/stacktrace/CMakeLists.txt +++ b/vespamalloc/src/tests/stacktrace/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespamalloc_stacktrace_test_app +vespa_add_executable(vespamalloc_stacktrace_test_app TEST SOURCES stacktrace.cpp backtrace.c diff --git a/vespamalloc/src/tests/test1/CMakeLists.txt b/vespamalloc/src/tests/test1/CMakeLists.txt index dc0217b139a..205de0f96fc 100644 --- a/vespamalloc/src/tests/test1/CMakeLists.txt +++ b/vespamalloc/src/tests/test1/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespamalloc_testatomic_app +vespa_add_executable(vespamalloc_testatomic_app TEST SOURCES testatomic.cpp DEPENDS diff --git a/vespamalloc/src/tests/test2/CMakeLists.txt b/vespamalloc/src/tests/test2/CMakeLists.txt index 668c09feb03..c2bd7fc1a70 100644 --- a/vespamalloc/src/tests/test2/CMakeLists.txt +++ b/vespamalloc/src/tests/test2/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespamalloc_testgraph_app +vespa_add_executable(vespamalloc_testgraph_app TEST SOURCES testgraph.cpp ../../vespamalloc/util/stream.cpp diff --git a/vespamalloc/src/tests/thread/CMakeLists.txt b/vespamalloc/src/tests/thread/CMakeLists.txt index 67539a68f77..e9bf1489347 100644 --- a/vespamalloc/src/tests/thread/CMakeLists.txt +++ b/vespamalloc/src/tests/thread/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespamalloc_thread_test_app +vespa_add_executable(vespamalloc_thread_test_app TEST SOURCES thread.cpp ) |