Skip to content

Commit 6b68303

Browse files
authored
Merge pull request #20109 from gottesmm/pr-60b76bba625dd71797c6790a927e6b56081af615
[build-preset] Add no_test variants of all of the buildbot_linux_* pr…
2 parents aba53ee + d6323fb commit 6b68303

File tree

1 file changed

+41
-5
lines changed

1 file changed

+41
-5
lines changed

utils/build-presets.ini

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -765,11 +765,7 @@ install-foundation
765765
install-libdispatch
766766
reconfigure
767767

768-
769-
# Linux package with out test
770-
[preset: buildbot_linux,no_test]
771-
mixin-preset=buildbot_linux
772-
768+
[preset: mixin_buildbot_linux,no_test]
773769
dash-dash
774770

775771
skip-test-cmark
@@ -783,6 +779,12 @@ skip-test-libdispatch
783779
skip-test-playgroundsupport
784780
skip-test-libicu
785781

782+
# Linux package with out test
783+
[preset: buildbot_linux,no_test]
784+
mixin-preset=
785+
buildbot_linux
786+
mixin_buildbot_linux,no_test
787+
786788
[preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build]
787789
mixin-preset=buildbot_linux
788790

@@ -804,23 +806,57 @@ android-icu-i18n-include=%(arm_dir)s/icu/source/i18n
804806
[preset: buildbot_linux_1804]
805807
mixin-preset=buildbot_linux
806808

809+
# Ubuntu 18.04 preset that skips all tests except for integration testing of the
810+
# package.
811+
[preset: buildbot_linux_1804,notest]
812+
mixin-preset=
813+
buildbot_linux_1804
814+
mixin_buildbot_linux,no_test
807815

808816
# Ubuntu 16.10 preset for backwards compat and future customizations.
809817
[preset: buildbot_linux_1610]
810818
mixin-preset=buildbot_linux
811819

820+
# Ubuntu 16.10 preset that skips all tests except for integration testing of the
821+
# package.
822+
[preset: buildbot_linux_1610,notest]
823+
mixin-preset=
824+
buildbot_linux_1610
825+
mixin_buildbot_linux,no_test
826+
812827
# Ubuntu 16.04 preset for backwards compat and future customizations.
813828
[preset: buildbot_linux_1604]
814829
mixin-preset=buildbot_linux
815830

831+
# Ubuntu 16.04 preset that skips all tests except for integration testing of the
832+
# package.
833+
[preset: buildbot_linux_1604,notest]
834+
mixin-preset=
835+
buildbot_linux_1604
836+
mixin_buildbot_linux,no_test
837+
816838
# Ubuntu 15.10 preset for backwards compat and future customizations.
817839
[preset: buildbot_linux_1510]
818840
mixin-preset=buildbot_linux
819841

842+
# Ubuntu 15.10 preset that skips all tests except for integration testing of the
843+
# package.
844+
[preset: buildbot_linux_1510,notest]
845+
mixin-preset=
846+
buildbot_linux_1510
847+
mixin_buildbot_linux,no_test
848+
820849
# Ubuntu 14.04 preset for backwards compat and future customizations.
821850
[preset: buildbot_linux_1404]
822851
mixin-preset=buildbot_linux
823852

853+
# Ubuntu 14.04 preset that skips all tests except for integration testing of the
854+
# package.
855+
[preset: buildbot_linux_1404,notest]
856+
mixin-preset=
857+
buildbot_linux_1404
858+
mixin_buildbot_linux,no_test
859+
824860
[preset: buildbot_linux,smoketest]
825861
mixin-preset=mixin_linux_installation
826862
build-subdir=buildbot_linux

0 commit comments

Comments
 (0)