~ubuntu-branches/ubuntu/maverick/glib2.0/maverick-proposed

« back to all changes in this revision

Viewing changes to tests/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-08-09 11:51:31 UTC
  • mfrom: (1.51.1 upstream) (3.4.23 experimental)
  • Revision ID: james.westby@ubuntu.com-20100809115131-pbojavp0jx7vtcah
Tags: 2.25.13-1ubuntu1
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control.in:
  - Add Vcs-Bzr link
  - Recommend libdconf0
  - Don't use "linux-any" for now since soyuz doesn't handle it
  - Suggest python-subunit for dev package
* debian/libglib2.0-0.symbols:
  - Updated the symbols list for the gio launcher handler
* debian/rules:
  - Stop installing the sizable upstream changelog.
* debian/patches/01_gettext-desktopfiles.patch:
  - Updated to use gettext for X-GNOME-Fullname too
* debian/patches/05_file_size_units.patch:
  - Use base 10 units in g_format_size_for_display() (disabled)
* debian/patches/61_glib-compile-schemas-path.patch:
  - Don't use that change since there is a depends which assures to the 
    upstream binary location to be there
* debian/patches/71_gio_launch_handler.patch:
  - New GIO default launch handle feature required for wncksync
* debian/watch:
  - Watch for unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
89
89
        dirname-test$(EXEEXT) file-test$(EXEEXT) env-test$(EXEEXT) \
90
90
        gio-test$(EXEEXT) iochannel-test$(EXEEXT) \
91
91
        mainloop-test$(EXEEXT) mapping-test$(EXEEXT) \
92
 
        markup-collect$(EXEEXT) markup-escape-test$(EXEEXT) \
93
 
        module-test$(EXEEXT) onceinit$(EXEEXT) patterntest$(EXEEXT) \
94
 
        queue-test$(EXEEXT) asyncqueue-test$(EXEEXT) \
95
 
        qsort-test$(EXEEXT) relation-test$(EXEEXT) shell-test$(EXEEXT) \
96
 
        slice-test$(EXEEXT) slice-color$(EXEEXT) \
97
 
        slice-concurrent$(EXEEXT) slice-threadinit$(EXEEXT) \
98
 
        spawn-test$(EXEEXT) $(am__EXEEXT_2) thread-test$(EXEEXT) \
99
 
        threadpool-test$(EXEEXT) type-test$(EXEEXT) \
100
 
        unicode-caseconv$(EXEEXT) unicode-encoding$(EXEEXT)
101
 
am__EXEEXT_4 = markup-test$(EXEEXT) unicode-collate$(EXEEXT) \
102
 
        bookmarkfile-test$(EXEEXT)
 
92
        module-test$(EXEEXT) onceinit$(EXEEXT) \
 
93
        asyncqueue-test$(EXEEXT) qsort-test$(EXEEXT) \
 
94
        relation-test$(EXEEXT) slice-test$(EXEEXT) \
 
95
        slice-color$(EXEEXT) slice-concurrent$(EXEEXT) \
 
96
        slice-threadinit$(EXEEXT) spawn-test$(EXEEXT) $(am__EXEEXT_2) \
 
97
        thread-test$(EXEEXT) threadpool-test$(EXEEXT) \
 
98
        type-test$(EXEEXT) unicode-caseconv$(EXEEXT) \
 
99
        unicode-encoding$(EXEEXT)
 
100
am__EXEEXT_4 = unicode-collate$(EXEEXT)
103
101
am__EXEEXT_5 = testglib$(EXEEXT)
104
102
@ENABLE_TIMELOOP_TRUE@am__EXEEXT_6 = timeloop$(EXEEXT) \
105
103
@ENABLE_TIMELOOP_TRUE@  timeloop-closure$(EXEEXT)
120
118
bit_test_SOURCES = bit-test.c
121
119
bit_test_OBJECTS = bit-test.$(OBJEXT)
122
120
bit_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
123
 
bookmarkfile_test_SOURCES = bookmarkfile-test.c
124
 
bookmarkfile_test_OBJECTS = bookmarkfile-test.$(OBJEXT)
125
 
bookmarkfile_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
126
121
child_test_SOURCES = child-test.c
127
122
child_test_OBJECTS = child-test.$(OBJEXT)
128
123
child_test_DEPENDENCIES = $(am__DEPENDENCIES_3)
158
153
mapping_test_SOURCES = mapping-test.c
159
154
mapping_test_OBJECTS = mapping-test.$(OBJEXT)
160
155
mapping_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
161
 
markup_collect_SOURCES = markup-collect.c
162
 
markup_collect_OBJECTS = markup-collect.$(OBJEXT)
163
 
markup_collect_DEPENDENCIES = $(am__DEPENDENCIES_2)
164
 
markup_escape_test_SOURCES = markup-escape-test.c
165
 
markup_escape_test_OBJECTS = markup-escape-test.$(OBJEXT)
166
 
markup_escape_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
167
 
markup_test_SOURCES = markup-test.c
168
 
markup_test_OBJECTS = markup-test.$(OBJEXT)
169
 
markup_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
170
156
module_test_SOURCES = module-test.c
171
157
module_test_OBJECTS = module-test.$(OBJEXT)
172
158
am__DEPENDENCIES_4 = $(libgmodule) $(am__DEPENDENCIES_1) \
178
164
onceinit_SOURCES = onceinit.c
179
165
onceinit_OBJECTS = onceinit.$(OBJEXT)
180
166
onceinit_DEPENDENCIES = $(am__DEPENDENCIES_3)
181
 
patterntest_SOURCES = patterntest.c
182
 
patterntest_OBJECTS = patterntest.$(OBJEXT)
183
 
patterntest_DEPENDENCIES = $(libglib)
184
167
qsort_test_SOURCES = qsort-test.c
185
168
qsort_test_OBJECTS = qsort-test.$(OBJEXT)
186
169
qsort_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
187
 
queue_test_SOURCES = queue-test.c
188
 
queue_test_OBJECTS = queue-test.$(OBJEXT)
189
 
queue_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
190
170
relation_test_SOURCES = relation-test.c
191
171
relation_test_OBJECTS = relation-test.$(OBJEXT)
192
172
relation_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
193
 
shell_test_SOURCES = shell-test.c
194
 
shell_test_OBJECTS = shell-test.$(OBJEXT)
195
 
shell_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
196
173
am_slice_color_OBJECTS = slice-color.$(OBJEXT) memchunks.$(OBJEXT)
197
174
slice_color_OBJECTS = $(am_slice_color_OBJECTS)
198
175
slice_color_DEPENDENCIES = $(am__DEPENDENCIES_3)
296
273
am__v_GEN_0 = @echo "  GEN   " $@;
297
274
SOURCES = $(libmoduletestplugin_a_la_SOURCES) \
298
275
        $(libmoduletestplugin_b_la_SOURCES) assert-msg-test.c \
299
 
        asyncqueue-test.c atomic-test.c bit-test.c bookmarkfile-test.c \
300
 
        child-test.c completion-test.c $(cxx_test_SOURCES) \
301
 
        dirname-test.c env-test.c errorcheck-mutex-test.c file-test.c \
302
 
        gio-test.c iochannel-test.c mainloop-test.c mapping-test.c \
303
 
        markup-collect.c markup-escape-test.c markup-test.c \
304
 
        module-test.c onceinit.c patterntest.c qsort-test.c \
305
 
        queue-test.c relation-test.c shell-test.c \
306
 
        $(slice_color_SOURCES) $(slice_concurrent_SOURCES) \
307
 
        $(slice_test_SOURCES) $(slice_threadinit_SOURCES) spawn-test.c \
 
276
        asyncqueue-test.c atomic-test.c bit-test.c child-test.c \
 
277
        completion-test.c $(cxx_test_SOURCES) dirname-test.c \
 
278
        env-test.c errorcheck-mutex-test.c file-test.c gio-test.c \
 
279
        iochannel-test.c mainloop-test.c mapping-test.c module-test.c \
 
280
        onceinit.c qsort-test.c relation-test.c $(slice_color_SOURCES) \
 
281
        $(slice_concurrent_SOURCES) $(slice_test_SOURCES) \
 
282
        $(slice_threadinit_SOURCES) spawn-test.c \
308
283
        spawn-test-win32-gui.c testgdate.c testgdateparser.c \
309
284
        $(testglib_SOURCES) thread-test.c threadpool-test.c timeloop.c \
310
285
        timeloop-closure.c type-test.c unicode-caseconv.c \
311
286
        unicode-collate.c unicode-encoding.c unicode-normalize.c
312
287
DIST_SOURCES = $(libmoduletestplugin_a_la_SOURCES) \
313
288
        $(libmoduletestplugin_b_la_SOURCES) assert-msg-test.c \
314
 
        asyncqueue-test.c atomic-test.c bit-test.c bookmarkfile-test.c \
315
 
        child-test.c completion-test.c $(am__cxx_test_SOURCES_DIST) \
316
 
        dirname-test.c env-test.c errorcheck-mutex-test.c file-test.c \
317
 
        gio-test.c iochannel-test.c mainloop-test.c mapping-test.c \
318
 
        markup-collect.c markup-escape-test.c markup-test.c \
319
 
        module-test.c onceinit.c patterntest.c qsort-test.c \
320
 
        queue-test.c relation-test.c shell-test.c \
321
 
        $(slice_color_SOURCES) $(slice_concurrent_SOURCES) \
322
 
        $(slice_test_SOURCES) $(slice_threadinit_SOURCES) spawn-test.c \
 
289
        asyncqueue-test.c atomic-test.c bit-test.c child-test.c \
 
290
        completion-test.c $(am__cxx_test_SOURCES_DIST) dirname-test.c \
 
291
        env-test.c errorcheck-mutex-test.c file-test.c gio-test.c \
 
292
        iochannel-test.c mainloop-test.c mapping-test.c module-test.c \
 
293
        onceinit.c qsort-test.c relation-test.c $(slice_color_SOURCES) \
 
294
        $(slice_concurrent_SOURCES) $(slice_test_SOURCES) \
 
295
        $(slice_threadinit_SOURCES) spawn-test.c \
323
296
        spawn-test-win32-gui.c testgdate.c testgdateparser.c \
324
297
        $(testglib_SOURCES) thread-test.c threadpool-test.c timeloop.c \
325
298
        timeloop-closure.c type-test.c unicode-caseconv.c \
550
523
build_os = @build_os@
551
524
build_vendor = @build_vendor@
552
525
builddir = @builddir@
 
526
config_h_INCLUDES = @config_h_INCLUDES@
553
527
datadir = @datadir@
554
528
datarootdir = @datarootdir@
555
529
docdir = @docdir@
556
530
dvidir = @dvidir@
557
531
exec_prefix = @exec_prefix@
 
532
gio_INCLUDES = @gio_INCLUDES@
 
533
glib_INCLUDES = @glib_INCLUDES@
 
534
gmodule_INCLUDES = @gmodule_INCLUDES@
 
535
gobject_INCLUDES = @gobject_INCLUDES@
 
536
gthread_INCLUDES = @gthread_INCLUDES@
558
537
host = @host@
559
538
host_alias = @host_alias@
560
539
host_cpu = @host_cpu@
601
580
TEST_PROGS = testglib
602
581
SUBDIRS = gobject refcount
603
582
AM_CPPFLAGS = \
604
 
        -I$(top_srcdir)                 \
605
 
        -I$(top_srcdir)/glib            \
606
 
        -I$(top_srcdir)/gmodule         \
 
583
        $(gmodule_INCLUDES)             \
607
584
        $(GLIB_DEBUG_FLAGS)
608
585
 
609
586
AM_CFLAGS = -g
628
605
@ENABLE_TIMELOOP_TRUE@timeloop = timeloop timeloop-closure
629
606
testglib_SOURCES = testglib.c
630
607
testglib_LDADD = $(libglib)
631
 
patterntest_LDADD = $(libglib)
632
608
testgdate_LDADD = $(libglib)
633
609
testgdateparser_LDADD = $(libglib)
634
610
unicode_normalize_LDADD = $(libglib)
649
625
        iochannel-test                          \
650
626
        mainloop-test                           \
651
627
        mapping-test                            \
652
 
        markup-collect                          \
653
 
        markup-escape-test                      \
654
628
        module-test                             \
655
629
        onceinit                                \
656
 
        patterntest                             \
657
 
        queue-test                              \
658
630
        asyncqueue-test                         \
659
631
        qsort-test                              \
660
632
        relation-test                           \
661
 
        shell-test                              \
662
633
        slice-test                              \
663
634
        slice-color                             \
664
635
        slice-concurrent                        \
671
642
        unicode-caseconv                        \
672
643
        unicode-encoding
673
644
 
674
 
test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh run-assert-msg-test.sh
675
 
test_script_support_programs = markup-test unicode-collate bookmarkfile-test
 
645
test_scripts = run-collate-tests.sh run-assert-msg-test.sh
 
646
test_script_support_programs = unicode-collate
676
647
TESTS_ENVIRONMENT = srcdir=$(srcdir) \
677
648
        LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \
678
649
        MALLOC_CHECK_=2 \
683
654
module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
684
655
atomic_test_LDADD = $(progs_ldadd)
685
656
bit_test_LDADD = $(progs_ldadd)
686
 
bookmarkfile_test_LDADD = $(progs_ldadd)
687
657
child_test_LDADD = $(thread_ldadd)
688
658
completion_test_LDADD = $(progs_ldadd)
689
659
date_test_LDADD = $(progs_ldadd)
694
664
iochannel_test_LDADD = $(progs_ldadd)
695
665
list_test_LDADD = $(progs_ldadd)
696
666
mainloop_test_LDADD = $(thread_ldadd)
697
 
markup_test_LDADD = $(progs_ldadd)
698
667
mapping_test_LDADD = $(progs_ldadd)
699
 
markup_escape_test_LDADD = $(progs_ldadd)
700
668
module_test_LDADD = $(module_ldadd) $(module_test_exp)
701
669
module_test_LDFLAGS = $(G_MODULE_LDFLAGS)
702
670
onceinit_LDADD = $(thread_ldadd)
703
 
queue_test_LDADD = $(progs_ldadd)
704
671
asyncqueue_test_LDADD = $(thread_ldadd)
705
672
qsort_test_LDADD = $(progs_ldadd)
706
673
relation_test_LDADD = $(progs_ldadd)
707
 
shell_test_LDADD = $(progs_ldadd)
708
674
slice_test_SOURCES = slice-test.c memchunks.c
709
675
slice_test_LDADD = $(thread_ldadd)
710
676
slice_color_SOURCES = slice-color.c memchunks.c
720
686
unicode_encoding_LDADD = $(progs_ldadd)
721
687
unicode_caseconv_LDADD = $(progs_ldadd)
722
688
unicode_collate_LDADD = $(progs_ldadd)
723
 
markup_collect_LDADD = $(progs_ldadd)
724
689
noinst_LTLIBRARIES = libmoduletestplugin_a.la libmoduletestplugin_b.la
725
690
libmoduletestplugin_a_la_SOURCES = libmoduletestplugin_a.c
726
691
libmoduletestplugin_a_la_LDFLAGS = $(G_MODULE_LDFLAGS) -avoid-version -module $(no_undefined) -rpath $(libdir)
814
779
bit-test$(EXEEXT): $(bit_test_OBJECTS) $(bit_test_DEPENDENCIES) 
815
780
        @rm -f bit-test$(EXEEXT)
816
781
        $(AM_V_CCLD)$(LINK) $(bit_test_OBJECTS) $(bit_test_LDADD) $(LIBS)
817
 
bookmarkfile-test$(EXEEXT): $(bookmarkfile_test_OBJECTS) $(bookmarkfile_test_DEPENDENCIES) 
818
 
        @rm -f bookmarkfile-test$(EXEEXT)
819
 
        $(AM_V_CCLD)$(LINK) $(bookmarkfile_test_OBJECTS) $(bookmarkfile_test_LDADD) $(LIBS)
820
782
child-test$(EXEEXT): $(child_test_OBJECTS) $(child_test_DEPENDENCIES) 
821
783
        @rm -f child-test$(EXEEXT)
822
784
        $(AM_V_CCLD)$(LINK) $(child_test_OBJECTS) $(child_test_LDADD) $(LIBS)
850
812
mapping-test$(EXEEXT): $(mapping_test_OBJECTS) $(mapping_test_DEPENDENCIES) 
851
813
        @rm -f mapping-test$(EXEEXT)
852
814
        $(AM_V_CCLD)$(LINK) $(mapping_test_OBJECTS) $(mapping_test_LDADD) $(LIBS)
853
 
markup-collect$(EXEEXT): $(markup_collect_OBJECTS) $(markup_collect_DEPENDENCIES) 
854
 
        @rm -f markup-collect$(EXEEXT)
855
 
        $(AM_V_CCLD)$(LINK) $(markup_collect_OBJECTS) $(markup_collect_LDADD) $(LIBS)
856
 
markup-escape-test$(EXEEXT): $(markup_escape_test_OBJECTS) $(markup_escape_test_DEPENDENCIES) 
857
 
        @rm -f markup-escape-test$(EXEEXT)
858
 
        $(AM_V_CCLD)$(LINK) $(markup_escape_test_OBJECTS) $(markup_escape_test_LDADD) $(LIBS)
859
 
markup-test$(EXEEXT): $(markup_test_OBJECTS) $(markup_test_DEPENDENCIES) 
860
 
        @rm -f markup-test$(EXEEXT)
861
 
        $(AM_V_CCLD)$(LINK) $(markup_test_OBJECTS) $(markup_test_LDADD) $(LIBS)
862
815
module-test$(EXEEXT): $(module_test_OBJECTS) $(module_test_DEPENDENCIES) 
863
816
        @rm -f module-test$(EXEEXT)
864
817
        $(AM_V_CCLD)$(module_test_LINK) $(module_test_OBJECTS) $(module_test_LDADD) $(LIBS)
865
818
onceinit$(EXEEXT): $(onceinit_OBJECTS) $(onceinit_DEPENDENCIES) 
866
819
        @rm -f onceinit$(EXEEXT)
867
820
        $(AM_V_CCLD)$(LINK) $(onceinit_OBJECTS) $(onceinit_LDADD) $(LIBS)
868
 
patterntest$(EXEEXT): $(patterntest_OBJECTS) $(patterntest_DEPENDENCIES) 
869
 
        @rm -f patterntest$(EXEEXT)
870
 
        $(AM_V_CCLD)$(LINK) $(patterntest_OBJECTS) $(patterntest_LDADD) $(LIBS)
871
821
qsort-test$(EXEEXT): $(qsort_test_OBJECTS) $(qsort_test_DEPENDENCIES) 
872
822
        @rm -f qsort-test$(EXEEXT)
873
823
        $(AM_V_CCLD)$(LINK) $(qsort_test_OBJECTS) $(qsort_test_LDADD) $(LIBS)
874
 
queue-test$(EXEEXT): $(queue_test_OBJECTS) $(queue_test_DEPENDENCIES) 
875
 
        @rm -f queue-test$(EXEEXT)
876
 
        $(AM_V_CCLD)$(LINK) $(queue_test_OBJECTS) $(queue_test_LDADD) $(LIBS)
877
824
relation-test$(EXEEXT): $(relation_test_OBJECTS) $(relation_test_DEPENDENCIES) 
878
825
        @rm -f relation-test$(EXEEXT)
879
826
        $(AM_V_CCLD)$(LINK) $(relation_test_OBJECTS) $(relation_test_LDADD) $(LIBS)
880
 
shell-test$(EXEEXT): $(shell_test_OBJECTS) $(shell_test_DEPENDENCIES) 
881
 
        @rm -f shell-test$(EXEEXT)
882
 
        $(AM_V_CCLD)$(LINK) $(shell_test_OBJECTS) $(shell_test_LDADD) $(LIBS)
883
827
slice-color$(EXEEXT): $(slice_color_OBJECTS) $(slice_color_DEPENDENCIES) 
884
828
        @rm -f slice-color$(EXEEXT)
885
829
        $(AM_V_CCLD)$(LINK) $(slice_color_OBJECTS) $(slice_color_LDADD) $(LIBS)
945
889
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asyncqueue-test.Po@am__quote@
946
890
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atomic-test.Po@am__quote@
947
891
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit-test.Po@am__quote@
948
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bookmarkfile-test.Po@am__quote@
949
892
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/child-test.Po@am__quote@
950
893
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/completion-test.Po@am__quote@
951
894
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx-test.Po@am__quote@
959
902
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmoduletestplugin_b.Plo@am__quote@
960
903
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mainloop-test.Po@am__quote@
961
904
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapping-test.Po@am__quote@
962
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-collect.Po@am__quote@
963
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-escape-test.Po@am__quote@
964
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-test.Po@am__quote@
965
905
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memchunks.Po@am__quote@
966
906
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module-test.Po@am__quote@
967
907
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/onceinit.Po@am__quote@
968
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patterntest.Po@am__quote@
969
908
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qsort-test.Po@am__quote@
970
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queue-test.Po@am__quote@
971
909
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relation-test.Po@am__quote@
972
 
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell-test.Po@am__quote@
973
910
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slice-color.Po@am__quote@
974
911
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slice-concurrent.Po@am__quote@
975
912
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slice-test.Po@am__quote@
1458
1395
### testing rules
1459
1396
 
1460
1397
# test: run all tests in cwd and subdirs
1461
 
test:   ${TEST_PROGS}
1462
 
@OS_UNIX_TRUE@  @test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS}
 
1398
test: test-nonrecursive
1463
1399
@OS_UNIX_TRUE@  @ for subdir in $(SUBDIRS) . ; do \
1464
1400
@OS_UNIX_TRUE@      test "$$subdir" = "." -o "$$subdir" = "po" || \
1465
1401
@OS_UNIX_TRUE@      ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
1466
1402
@OS_UNIX_TRUE@    done
1467
1403
 
 
1404
# test-nonrecursive: run tests only in cwd
 
1405
test-nonrecursive: ${TEST_PROGS}
 
1406
@OS_UNIX_TRUE@  @test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS}
 
1407
 
1468
1408
# test-report: run tests in subdirs and generate report
1469
1409
# perf-report: run tests in subdirs with -m perf and generate report
1470
1410
# full-report: like test-report: with -m perf and -m slow
1505
1445
            rm -rf "$$GTESTER_LOGDIR"/ ; \
1506
1446
            ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
1507
1447
          }
1508
 
.PHONY: test test-report perf-report full-report
 
1448
.PHONY: test test-report perf-report full-report test-nonrecursive
1509
1449
 
1510
1450
.PHONY: lcov genlcov lcov-clean
1511
1451
# use recursive makes in order to ignore errors during check
1528
1468
        -rm -rf glib-lcov.info glib-lcov
1529
1469
        -find -name '*.gcda' -print | xargs rm
1530
1470
 
1531
 
# run make test as part of make check
1532
 
check-local: test
 
1471
# run tests in cwd as part of make check
 
1472
check-local: test-nonrecursive
1533
1473
 
1534
1474
@PLATFORM_WIN32_TRUE@module-test.exp: module-test.o
1535
1475
@PLATFORM_WIN32_TRUE@   dlltool --output-exp module-test.exp module-test.o
1539
1479
        for f in $$files; do                                    \
1540
1480
          if test -f $$f; then d=.; else d=$(srcdir); fi;       \
1541
1481
          cp $$d/$$f $(distdir) || exit 1; done
1542
 
        mkdir $(distdir)/markups;                               \
1543
 
        for f in $(srcdir)/markups/* ; do                       \
1544
 
          cp $$f $(distdir)/markups; done 
1545
1482
        mkdir $(distdir)/collate;                               \
1546
1483
        for f in $(srcdir)/collate/* ; do                       \
1547
1484
          if test -f $$f; then cp $$f $(distdir)/collate; fi; done
1548
 
        mkdir $(distdir)/bookmarks;                             \
1549
 
        for f in $(srcdir)/bookmarks/* ; do                     \
1550
 
          cp $$f $(distdir)/bookmarks; done 
1551
1485
 
1552
1486
# Tell versions [3.59,3.63) of GNU make to not export all variables.
1553
1487
# Otherwise a system limit (for SysV at least) may be exceeded.