luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib.mk: Rework win32 test support

Browse Source 
Newer versions of automake (~1.13.1) seem to generate some new rules for
testcases that get tripped up on our use of $(addsuffix) and $(strip) so
take those out of the definition of TESTS on win32.
This commit is contained in:
Ryan Lortie 2013-06-01 10:07:33 -04:00
parent 601a00fa2a
commit 16ec629580
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glib.mk
View File

@ -48,10 +48,6 @@ else
test-nonrecursive: test-nonrecursive:
endif endif
if OS_WIN32
TESTS += $(addsuffix .exe, $(TEST_PROGS))
endif
# test-report: run tests in subdirs and generate report # test-report: run tests in subdirs and generate report
# perf-report: run tests in subdirs with -m perf and generate report # perf-report: run tests in subdirs with -m perf and generate report
# full-report: like test-report: with -m perf and -m slow # full-report: like test-report: with -m perf and -m slow
@ -167,6 +163,11 @@ check-local: test-nonrecursive
TEST_PROGS += $(strip $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \ TEST_PROGS += $(strip $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \
$(dist_test_scripts) $(dist_uninstalled_test_scripts)) $(dist_test_scripts) $(dist_uninstalled_test_scripts))
if OS_WIN32
TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \
$(dist_test_scripts) $(dist_uninstalled_test_scripts)
endif
# Note: build even the installed-only targets during 'make check' to ensure that they still work. # Note: build even the installed-only targets during 'make check' to ensure that they still work.
# We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to # We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to
# prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were # prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were