diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-16 08:45:07 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-16 08:45:07 +0200 |
| commit | 0e224de30ca0f303e93de0a0a46c3f8eae17ff93 (patch) | |
| tree | c4b98e3d828cf4dabcb411142d85d235b05f4d45 /vespamalloc | |
| parent | 72231250ed81e10d66bfe70701e64fa5fe50f712 (diff) | |
Merging code into new github branch.
Diffstat (limited to 'vespamalloc')
| -rw-r--r-- | vespamalloc/src/tests/allocfree/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | vespamalloc/src/tests/thread/thread_test.sh | 2 | ||||
| -rw-r--r-- | vespamalloc/src/vespamalloc/util/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/vespamalloc/src/tests/allocfree/CMakeLists.txt b/vespamalloc/src/tests/allocfree/CMakeLists.txt index 1dc36f8dec7..49a4b2f193a 100644 --- a/vespamalloc/src/tests/allocfree/CMakeLists.txt +++ b/vespamalloc/src/tests/allocfree/CMakeLists.txt @@ -21,3 +21,4 @@ vespa_add_executable(vespamalloc_linklist_test_app ../../vespamalloc/malloc/common.cpp $<TARGET_OBJECTS:vespamalloc_util> ) +vespa_add_target_system_dependency(vespamalloc_linklist_test_app dl) diff --git a/vespamalloc/src/tests/thread/thread_test.sh b/vespamalloc/src/tests/thread/thread_test.sh index edcd7a41a17..68654d35ce7 100755 --- a/vespamalloc/src/tests/thread/thread_test.sh +++ b/vespamalloc/src/tests/thread/thread_test.sh @@ -1,5 +1,7 @@ #!/bin/bash +ulimit -u 31215 + VESPA_MALLOC_SO=../../../src/vespamalloc/libvespamalloc.so VESPA_MALLOC_SO_D=../../../src/vespamalloc/libvespamalloc_vespamallocd.so diff --git a/vespamalloc/src/vespamalloc/util/CMakeLists.txt b/vespamalloc/src/vespamalloc/util/CMakeLists.txt index 5d06264f1df..e30d7aa9a27 100644 --- a/vespamalloc/src/vespamalloc/util/CMakeLists.txt +++ b/vespamalloc/src/vespamalloc/util/CMakeLists.txt @@ -7,3 +7,5 @@ vespa_add_library(vespamalloc_util OBJECT stream.cpp DEPENDS ) +vespa_add_target_system_dependency(vespamalloc_util dl) + |