summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-12-01 13:22:43 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-12-01 13:22:49 (GMT)
commite61c1cf64c4f39b00e0f8ed81466e85c773d9ba2 (patch)
tree2e020cf1ea4068a61309929ca8df77df07e2f5a6 /Tests
parent47c326c36bff1669f17ea2d89c49dc9152f8268a (diff)
parent3bcaa870078d875b65f17d82661a133f6d5cbdfc (diff)
downloadCMake-e61c1cf64c4f39b00e0f8ed81466e85c773d9ba2.zip
CMake-e61c1cf64c4f39b00e0f8ed81466e85c773d9ba2.tar.gz
CMake-e61c1cf64c4f39b00e0f8ed81466e85c773d9ba2.tar.bz2
Merge topic 'libuv-raii'
3bcaa870 cmUVHandlePtr: Add uv_process_ptr dd700e9b cmUVHandlePtr: Add uv_timer_ptr 32cfa7b3 cmUVHandlePtr: Move to CMakeLib to make it available everywhere Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1541
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CMakeLib/CMakeLists.txt4
-rw-r--r--Tests/CMakeLib/testUVRAII.cxx (renamed from Tests/CMakeServerLib/testUVRAII.cxx)2
-rw-r--r--Tests/CMakeServerLib/CMakeLists.txt1
3 files changed, 6 insertions, 1 deletions
diff --git a/Tests/CMakeLib/CMakeLists.txt b/Tests/CMakeLib/CMakeLists.txt
index d1a1df5..9f09185 100644
--- a/Tests/CMakeLib/CMakeLists.txt
+++ b/Tests/CMakeLib/CMakeLists.txt
@@ -12,6 +12,7 @@ set(CMakeLib_TESTS
testXMLParser
testXMLSafe
testFindPackageCommand
+ testUVRAII
)
set(testRST_ARGS ${CMAKE_CURRENT_SOURCE_DIR})
@@ -31,6 +32,9 @@ create_test_sourcelist(CMakeLib_TEST_SRCS CMakeLibTests.cxx ${CMakeLib_TESTS})
add_executable(CMakeLibTests ${CMakeLib_TEST_SRCS})
target_link_libraries(CMakeLibTests CMakeLib)
+set_property(TARGET CMakeLibTests PROPERTY C_CLANG_TIDY "")
+set_property(TARGET CMakeLibTests PROPERTY CXX_CLANG_TIDY "")
+
add_executable(testEncoding testEncoding.cxx)
target_link_libraries(testEncoding cmsys)
diff --git a/Tests/CMakeServerLib/testUVRAII.cxx b/Tests/CMakeLib/testUVRAII.cxx
index 7ecef39..44def25 100644
--- a/Tests/CMakeServerLib/testUVRAII.cxx
+++ b/Tests/CMakeLib/testUVRAII.cxx
@@ -155,7 +155,9 @@ static bool testAllMoves()
struct allTypes
{
uv_stream_ptr _7;
+ uv_timer_ptr _8;
uv_tty_ptr _9;
+ uv_process_ptr _11;
uv_pipe_ptr _12;
uv_async_ptr _13;
uv_signal_ptr _14;
diff --git a/Tests/CMakeServerLib/CMakeLists.txt b/Tests/CMakeServerLib/CMakeLists.txt
index f1ca2a4..5e1ad0c 100644
--- a/Tests/CMakeServerLib/CMakeLists.txt
+++ b/Tests/CMakeServerLib/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(
set(CMakeServerLib_TESTS
testServerBuffering
- testUVRAII
)
create_test_sourcelist(CMakeLib_TEST_SRCS CMakeServerLibTests.cxx ${CMakeServerLib_TESTS})