Midori Web Browser

Merge lp:~tintou/midori/midori-testing into lp:midori

  1. midori-testing
  2. Merge into trunk
Proposed by Corentin Noël
Status: Rejected
Rejected by: Corentin Noël
Proposed branch: lp:~tintou/midori/midori-testing
Merge into: lp:midori
Diff against target: 56 lines (+10/-4)
2 files modified
CMakeLists.txt (+6/-3)
configure (+4/-1)
To merge this branch: bzr merge lp:~tintou/midori/midori-testing
Reviewer Review Type Date Requested Status
Cris Dywan Disapprove
Review via email: mp+200342@code.launchpad.net

Description of the change

Added Testing option: while packaging it is not usefull to do test.

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

"do" in this context means "compile". I disagree, you should actually run them and observe the results. Binaries that don't pass tests should be the exception - make noise in bug reports or IRC and produce logs if they don't pass.

review: Disapprove

Unmerged revisions

6529. By Corentin Noël

Added testing option to CMake

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-11-28 17:46:14 +0000
3+++ CMakeLists.txt 2014-01-02 20:57:36 +0000
4@@ -155,6 +155,7 @@
5 option(USE_GRANITE "Fancy notebook and pop-overs" OFF)
6 option(USE_APIDOCS "API documentation" OFF)
7 option(EXTRA_WARNINGS "Additional compiler warnings" OFF)
8+option(USE_TESTING "Make use of CTest" OFF)
9
10 # GTK+3 is implied here, whether set or not
11 if (USE_GRANITE OR HALF_BRO_INCOM_WEBKIT2)
12@@ -276,10 +277,12 @@
13 add_subdirectory (icons)
14 add_subdirectory (data)
15 add_subdirectory (config)
16-enable_testing()
17-add_subdirectory (tests)
18+if (USE_TESTING)
19+ enable_testing()
20+ add_subdirectory (tests)
21+endif ()
22 add_subdirectory (extensions)
23
24 if (USE_APIDOCS)
25 add_subdirectory (docs/api)
26-endif ()
27+endif ()
28\ No newline at end of file
29
30=== modified file 'configure'
31--- configure 2013-11-05 18:00:59 +0000
32+++ configure 2014-01-02 20:57:36 +0000
33@@ -17,6 +17,7 @@
34 #~ --disable-zeitgeist Disable Zeitgeist history integration
35 #~ --enable-granite Fancy notebook and pop-overs
36 #~ --enable-apidocs API documentation
37+#~ --enable-testing Use CTest
38 #~
39 #~ Environment:
40 #~ VALAC if defined the valac executable to use, for example valac-0.16
41@@ -39,6 +40,8 @@
42 ARGS="$ARGS -DUSE_APIDOCS=1";;
43 --extra-warnings)
44 ARGS="$ARGS -DEXTRA_WARNINGS=1";;
45+ --enable-testing)
46+ ARGS="$ARGS -DUSE_TESTING=1";;
47 --prefix=*)
48 ARGS="$ARGS -DCMAKE_INSTALL_PREFIX=${1#*=}";;
49 *)
50@@ -80,4 +83,4 @@
51 cmake $ARGS .. || exit 1
52
53 echo
54-echo "Configuring done, run \"make\" to compile"
55+echo "Configuring done, run \"make\" to compile"
56\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: