overlay-scrollbar

Merge lp:~ballogy/overlay-scrollbar/make-tests-optional into lp:overlay-scrollbar

  1. make-tests-optional
  2. Merge into trunk
Proposed by Balló György
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 317
Merged at revision: 322
Proposed branch: lp:~ballogy/overlay-scrollbar/make-tests-optional
Merge into: lp:overlay-scrollbar
Diff against target: 42 lines (+12/-2)
2 files modified
Makefile.am (+5/-2)
configure.ac (+7/-0)
To merge this branch: bzr merge lp:~ballogy/overlay-scrollbar/make-tests-optional
Reviewer Review Type Date Requested Status
Ayatana Scrollbar Team Pending
Review via email: mp+83502@code.launchpad.net

Description of the change

This change makes it possible to disable building tests with '--disable-tests' configure switch.

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

I'd rather use a different name instead WANT_TESTS... I don't know, ENABLE_TESTS or DISABLE_TESTS?

Revision history for this message
Andrea Cimitan (cimi) wrote :

Or others... but thanks, looks nice!

Revision history for this message
Andrea Cimitan (cimi) wrote :

Merged with ENABLE_TESTS

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2011-04-21 14:33:22 +0000
3+++ Makefile.am 2011-11-27 02:22:02 +0000
4@@ -3,8 +3,11 @@
5 data \
6 build \
7 pkgconfig \
8- os \
9- tests
10+ os
11+
12+if WANT_TESTS
13+SUBDIRS += tests
14+endif
15
16 ACLOCAL_AMFLAGS = -I build
17
18
19=== modified file 'configure.ac'
20--- configure.ac 2011-10-19 15:35:09 +0000
21+++ configure.ac 2011-11-27 02:22:02 +0000
22@@ -88,6 +88,12 @@
23 )
24 AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
25
26+# Check if build tests
27+AC_ARG_ENABLE([tests],
28+ AC_HELP_STRING([--disable-tests], [Disable tests]),,
29+ [enable_tests=yes])
30+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
31+
32 # Debug flags
33
34 if test x$OS_TRUNK = xyes; then
35@@ -171,6 +177,7 @@
36 echo " ========================="
37 echo ""
38 echo " Gtk+: ${with_gtk}"
39+echo " Tests: ${enable_tests}"
40 echo " Debug: ${enable_debug}"
41 echo " Prefix: ${prefix}"
42 echo ""

Subscribers

People subscribed via source and target branches