Contents of /trunk/libnotify/patches/libnotify-0.7.3-gtk3-tests.patch
Parent Directory | Revision Log
Revision 1337 -
(show annotations)
(download)
Wed Jun 1 20:39:47 2011 UTC (13 years, 3 months ago) by niro
File size: 2352 byte(s)
Wed Jun 1 20:39:47 2011 UTC (13 years, 3 months ago) by niro
File size: 2352 byte(s)
-added patch to disable gtk3 tests
1 | Don't build gtk+:3 tests if not required |
2 | |
3 | patch originally by Gilles (eva) |
4 | |
5 | --- |
6 | --- configure.ac |
7 | +++ configure.ac |
8 | @@ -93,9 +93,13 @@ |
9 | AC_SUBST([pkg_modules]) |
10 | PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) |
11 | |
12 | +AC_ARG_ENABLE([tests], |
13 | + AS_HELP_STRING([--enable-tests], [Check for extra dependencies to build all tests])) |
14 | +AS_IF([test $enable_tests = yes], [ |
15 | tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION" |
16 | PKG_CHECK_MODULES(TESTS, [$tests_modules]) |
17 | - |
18 | +]) |
19 | +AM_CONDITIONAL([MORE_TESTS], [test $enable_tests = yes]) |
20 | GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` |
21 | AC_SUBST(GLIB_GENMARSHAL) |
22 | |
23 | --- tests/Makefile.am |
24 | +++ tests/Makefile.am |
25 | @@ -2,18 +2,15 @@ |
26 | -I$(top_srcdir) \ |
27 | $(TESTS_CFLAGS) |
28 | |
29 | -noinst_PROGRAMS = \ |
30 | +check_PROGRAMS = \ |
31 | test-replace \ |
32 | - test-replace-widget \ |
33 | test-server-info \ |
34 | test-default-action \ |
35 | test-multi-actions \ |
36 | test-action-icons \ |
37 | - test-image \ |
38 | test-basic \ |
39 | test-error \ |
40 | test-markup \ |
41 | - test-persistence \ |
42 | test-resident \ |
43 | test-rtl \ |
44 | test-size-changes \ |
45 | @@ -23,6 +20,22 @@ |
46 | test-xy-actions \ |
47 | test-xy-stress |
48 | |
49 | +#if MORE_TESTS |
50 | +check_PROGRAMS += \ |
51 | + test-image \ |
52 | + test-replace-widget \ |
53 | + test-persistence |
54 | + |
55 | +test_replace_widget_SOURCES = test-replace-widget.c |
56 | +test_replace_widget_LDADD = $(common_ldflags) |
57 | + |
58 | +test_image_SOURCES = test-image.c |
59 | +test_image_LDADD = $(common_ldflags) |
60 | + |
61 | +test_persistence_SOURCES = test-persistence.c |
62 | +test_persistence_LDADD = $(common_ldflags) |
63 | +#endif |
64 | + |
65 | common_ldflags = \ |
66 | $(top_builddir)/libnotify/libnotify.la \ |
67 | $(TESTS_LIBS) |
68 | @@ -30,9 +43,6 @@ |
69 | test_replace_SOURCES = test-replace.c |
70 | test_replace_LDADD = $(common_ldflags) |
71 | |
72 | -test_replace_widget_SOURCES = test-replace-widget.c |
73 | -test_replace_widget_LDADD = $(common_ldflags) |
74 | - |
75 | test_server_info_SOURCES = test-server-info.c |
76 | test_server_info_LDADD = $(common_ldflags) |
77 | |
78 | @@ -48,9 +58,6 @@ |
79 | test_action_icons_SOURCES = test-action-icons.c |
80 | test_action_icons_LDADD = $(common_ldflags) |
81 | |
82 | -test_image_SOURCES = test-image.c |
83 | -test_image_LDADD = $(common_ldflags) |
84 | - |
85 | test_basic_SOURCES = test-basic.c |
86 | test_basic_LDADD = $(common_ldflags) |
87 | |
88 | @@ -75,9 +82,6 @@ |
89 | test_rtl_SOURCES = test-rtl.c |
90 | test_rtl_LDADD = $(common_ldflags) |
91 | |
92 | -test_persistence_SOURCES = test-persistence.c |
93 | -test_persistence_LDADD = $(common_ldflags) |
94 | - |
95 | test_resident_SOURCES = test-resident.c |
96 | test_resident_LDADD = $(common_ldflags) |
97 |