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