diff --git a/utils/build-presets.ini b/utils/build-presets.ini index 880293111772e..407cfe4d513e5 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -765,11 +765,7 @@ install-foundation install-libdispatch reconfigure - -# Linux package with out test -[preset: buildbot_linux,no_test] -mixin-preset=buildbot_linux - +[preset: mixin_buildbot_linux,no_test] dash-dash skip-test-cmark @@ -783,6 +779,12 @@ skip-test-libdispatch skip-test-playgroundsupport skip-test-libicu +# Linux package with out test +[preset: buildbot_linux,no_test] +mixin-preset= + buildbot_linux + mixin_buildbot_linux,no_test + [preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build] mixin-preset=buildbot_linux @@ -804,23 +806,57 @@ android-icu-i18n-include=%(arm_dir)s/icu/source/i18n [preset: buildbot_linux_1804] mixin-preset=buildbot_linux +# Ubuntu 18.04 preset that skips all tests except for integration testing of the +# package. +[preset: buildbot_linux_1804,notest] +mixin-preset= + buildbot_linux_1804 + mixin_buildbot_linux,no_test # Ubuntu 16.10 preset for backwards compat and future customizations. [preset: buildbot_linux_1610] mixin-preset=buildbot_linux +# Ubuntu 16.10 preset that skips all tests except for integration testing of the +# package. +[preset: buildbot_linux_1610,notest] +mixin-preset= + buildbot_linux_1610 + mixin_buildbot_linux,no_test + # Ubuntu 16.04 preset for backwards compat and future customizations. [preset: buildbot_linux_1604] mixin-preset=buildbot_linux +# Ubuntu 16.04 preset that skips all tests except for integration testing of the +# package. +[preset: buildbot_linux_1604,notest] +mixin-preset= + buildbot_linux_1604 + mixin_buildbot_linux,no_test + # Ubuntu 15.10 preset for backwards compat and future customizations. [preset: buildbot_linux_1510] mixin-preset=buildbot_linux +# Ubuntu 15.10 preset that skips all tests except for integration testing of the +# package. +[preset: buildbot_linux_1510,notest] +mixin-preset= + buildbot_linux_1510 + mixin_buildbot_linux,no_test + # Ubuntu 14.04 preset for backwards compat and future customizations. [preset: buildbot_linux_1404] mixin-preset=buildbot_linux +# Ubuntu 14.04 preset that skips all tests except for integration testing of the +# package. +[preset: buildbot_linux_1404,notest] +mixin-preset= + buildbot_linux_1404 + mixin_buildbot_linux,no_test + [preset: buildbot_linux,smoketest] mixin-preset=mixin_linux_installation build-subdir=buildbot_linux