summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--odk/CustomTarget_check.mk5
-rw-r--r--unoidl/CustomTarget_unoidl-write_test.mk4
2 files changed, 9 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:
diff --git a/unoidl/CustomTarget_unoidl-write_test.mk b/unoidl/CustomTarget_unoidl-write_test.mk
index 22c25b0085c5..a1c17c488bc3 100644
--- a/unoidl/CustomTarget_unoidl-write_test.mk
+++ b/unoidl/CustomTarget_unoidl-write_test.mk
@@ -25,6 +25,9 @@ $(call gb_CustomTarget_get_target,unoidl/unoidl-write_test) : \
$(SRCDIR)/idlc/test/parser/struct.tests \
$(SRCDIR)/idlc/test/parser/typedef.tests \
| $(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/.dir
+ifneq ($(gb_SUPPRESS_TESTS),)
+ @true
+else
$(call gb_Helper_abbreviate_dirs,( \
$(PERL) $(SRCDIR)/solenv/bin/exectest.pl \
$(SRCDIR)/idlc/test/parser/attribute.tests \
@@ -87,5 +90,6 @@ $(call gb_CustomTarget_get_target,unoidl/unoidl-write_test) : \
{} \
$(call gb_CustomTarget_get_workdir,unoidl/unoidl-write_test)/out.rdb) \
> $@.log 2>&1 || (cat $@.log && false))
+endif
# vim: set noet sw=4 ts=4: