summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-06-16 15:39:47 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-06-16 15:39:47 +0200
commit2dbd27012a23f113cf0daf5a0bb8368ebc3a9f89 (patch)
treec68e005bffe8e28d7dd5f9960f91e9356f6f86d8 /odk
parentc127c19de62201b49b6647ef3ee8b08ae49da852 (diff)
Still more tests to suppress
...that were missing from 3de594d3347ead24f3211714f0e0010c1434cdf2 "More tests to suppress (all .PHONY test targets should be covered now)" (and one wasn't even properly marked as .PHONY). Thanks to Rene for spotting. Change-Id: Ieed81a3999921bdfe9bca96c6002d8906b2ddfad
Diffstat (limited to 'odk')
-rw-r--r--odk/CustomTarget_check.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index dc983e2f67d8..f0b63489f054 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -24,6 +24,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),windows,\
$(if $(filter MACOSX,$(OS)),macosx,\
$(if $(filter AIX,$(OS)),aix))))))))
+.PHONY: $(call gb_CustomTarget_get_workdir,odk/check)/checkbin
$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(SRCDIR)/odk/util/check.pl \
$(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_doxygen)) \
@@ -38,6 +39,9 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(call gb_Package_get_target,odk_settings) \
$(call gb_Package_get_target,odk_settings_generated) \
$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
+ifneq ($(gb_SUPPRESS_TESTS),)
+ @true
+else
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
$(call gb_Helper_print_on_error,\
$(PERL) $< \
@@ -45,5 +49,6 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(odk_PLATFORM) '$(gb_Executable_EXT)' \
,$@.log \
)
+endif
# vim: set noet sw=4 ts=4: