diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-06-09 17:24:55 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-06-09 17:24:55 +0200 |
| commit | 3de594d3347ead24f3211714f0e0010c1434cdf2 (patch) | |
| tree | 203a2944812f7abbbea04586daebc72d54e90903 | |
| parent | Some compilers can't init vector from empty {} (diff) | |
| download | core-3de594d3347ead24f3211714f0e0010c1434cdf2.tar.gz core-3de594d3347ead24f3211714f0e0010c1434cdf2.zip | |
More tests to suppress (all .PHONY test targets should be covered now)
Change-Id: Ib948547e5c177ac62506fc42a564368a8d31fa4e
| -rw-r--r-- | idlc/CustomTarget_parser_test.mk | 4 | ||||
| -rw-r--r-- | odk/CustomTarget_build-examples.mk | 4 | ||||
| -rw-r--r-- | registry/CustomTarget_regcompare_test.mk | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/idlc/CustomTarget_parser_test.mk b/idlc/CustomTarget_parser_test.mk index 84b01d9cb45e..0c9d15e4f86b 100644 --- a/idlc/CustomTarget_parser_test.mk +++ b/idlc/CustomTarget_parser_test.mk @@ -25,6 +25,9 @@ $(call gb_CustomTarget_get_target,idlc/parser_test) : \ $(SRCDIR)/idlc/test/parser/struct.tests \ $(SRCDIR)/idlc/test/parser/typedef.tests \ | $(call gb_CustomTarget_get_workdir,idlc/parser_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 \ @@ -77,5 +80,6 @@ $(call gb_CustomTarget_get_target,idlc/parser_test) : \ $(call gb_Executable_get_command,idlc) \ -O $(call gb_CustomTarget_get_workdir,idlc/parser_test) {}) \ > $@.log 2>&1 || (cat $@.log && false)) +endif # vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-examples.mk index 89e427348087..81ac3a1437c6 100644 --- a/odk/CustomTarget_build-examples.mk +++ b/odk/CustomTarget_build-examples.mk @@ -89,6 +89,9 @@ endif $(call gb_CustomTarget_get_target,odk/build-examples): \ $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv +ifneq ($(gb_SUPPRESS_TESTS),) + @true +else $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) (saved_library_path=$${$(gb_Helper_LIBRARY_PATH_VAR)} && . $< \ $(if $(filter MACOSX,$(OS)),, \ @@ -102,6 +105,7 @@ $(call gb_CustomTarget_get_target,odk/build-examples): \ || (RET=$$? \ && cat $(call gb_CustomTarget_get_workdir,odk/build-examples)/log \ && exit $$RET) +endif $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv: \ $(SRCDIR)/odk/config/setsdkenv_unix.sh.in \ diff --git a/registry/CustomTarget_regcompare_test.mk b/registry/CustomTarget_regcompare_test.mk index efdc070a3620..e7816301f8ce 100644 --- a/registry/CustomTarget_regcompare_test.mk +++ b/registry/CustomTarget_regcompare_test.mk @@ -31,6 +31,9 @@ $(call gb_CustomTarget_get_target,registry/regcompare_test): \ $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb \ $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \ $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb +ifneq ($(gb_SUPPRESS_TESTS),) + @true +else $(call gb_Helper_abbreviate_dirs,( \ $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \ $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \ @@ -191,6 +194,7 @@ $(call gb_CustomTarget_get_target,registry/regcompare_test): \ $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \ -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb) \ > $@.log 2>&1 || (cat $@.log && false)) +endif $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/%.rdb: \ $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/%.urd \ |