Attachment 108348 Details for Bug 73689 – Include test-dbus and test-bus in cmake 'make check' target

[patch] Include test-dbus and test-bus in cmake 'make check' target

0001-Include-test-dbus-and-test-bus-in-cmake-make-check-tar.txt (text/plain), 1.23 KB, created by Ralf Habacker on 2014-10-24 10:22:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2014-10-24 10:22:28 UTC

Size: 1.23 KB

patch

obsolete

>From 5186bd8997132a1332a637a8e25b62cb065caf18 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Tue, 14 Jan 2014 18:59:18 +0100
>Subject: [PATCH 1/2] Include test-dbus and test-bus in cmake 'make check'
> target.
>
>Because test-dbus and test-bus lives in subdirectory dbus/bus, we need
>to define make 'check' in top level source directory.
>---
> cmake/CMakeLists.txt      | 3 +++
> cmake/test/CMakeLists.txt | 4 ----
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index 628a681..32250f5 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -496,6 +496,9 @@ add_subdirectory( dbus )
> add_subdirectory( bus )
> if (DBUS_BUILD_TESTS)
> 	add_subdirectory( test )
>+	add_custom_target(check
>+		COMMAND ctest -R ^test-.*
>+	)
> endif (DBUS_BUILD_TESTS)
> add_subdirectory( tools )
> add_subdirectory( doc )
>diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt
>index 13f639b..fb3b31e 100644
>--- a/cmake/test/CMakeLists.txt
>+++ b/cmake/test/CMakeLists.txt
>@@ -169,7 +169,3 @@ FOREACH(FILE ${FILES})
>         MESSAGE("FROM: ${FILE}\nTO: ${TARGET}\n")
>     ENDIF (CONFIG_VERBOSE)
> ENDFOREACH(FILE)
>-
>-add_custom_target(check
>-    COMMAND ctest -R ^test-.*
>-)
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 73689: 92216 | 92217 | 92295 | 107237 | 107446 | 107828 | 108323 | 108348 | 108352 | 108353

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.