From 1c5e7cf363f6e82f0650f49c1226a9accf6d23c9 Mon Sep 17 00:00:00 2001 From: Jonas Termansen Date: Mon, 29 Oct 2018 15:34:27 +0000 Subject: [PATCH] [infra] Stop using tests and exclude_tests fields in test matrix. These fields complicate how test.py is called and could just have well have been put in the arguments list for simplicity. They were already used inconsistently. The support can be removed from the recipe in a follow up changelist in the infra repository. Change-Id: Ib5c39d61d730bfcb719c1884d910bbd2f73b4fce Reviewed-on: https://dart-review.googlesource.com/c/81403 Reviewed-by: Alexander Thomas Commit-Queue: Jonas Termansen --- tools/bots/test_matrix.json | 171 +++++++++++++++++++----------------- 1 file changed, 90 insertions(+), 81 deletions(-) diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json index 2ba6dbcb8c670..c92fbb0006efc 100644 --- a/tools/bots/test_matrix.json +++ b/tools/bots/test_matrix.json @@ -898,9 +898,9 @@ "name": "dart2js tests", "arguments": [ "-ndart2js-hostasserts-linux-ia32-d8", - "--dart2js-batch" + "--dart2js-batch", + "--exclude_suite=observatory_ui" ], - "exclude_tests": ["observatory_ui"], "shards": 6, "fileset": "dart2js_hostasserts" }, @@ -918,25 +918,26 @@ "name": "dart2js package tests", "arguments": [ "-ndart2js-hostasserts-linux-ia32-d8", - "--dart2js-batch" - ], - "tests": ["pkg"] + "--dart2js-batch", + "pkg" + ] }, { "name": "dart2js observatory-ui tests", "arguments": [ "-ndart2js-hostasserts-linux-ia32-d8", - "--dart2js-batch" - ], - "tests": ["observatory_ui"] + "--dart2js-batch", + "observatory_ui" + ] }, { "name": "dart2js extra tests", "arguments": [ "-ndart2js-hostasserts-linux-ia32-d8", - "--dart2js-batch" - ], - "tests": ["dart2js_extra","dart2js_native"] + "--dart2js-batch", + "dart2js_extra", + "dart2js_native" + ] } ] }, @@ -965,9 +966,9 @@ "arguments": [ "-ndart2js-${system}-${runtime}", "--dart2js-batch", - "--reset-browser-configuration" + "--reset-browser-configuration", + "--exclude_suite=observatory_ui" ], - "exclude_tests": ["observatory_ui"], "shards": 6, "fileset": "dart2js" }, @@ -987,27 +988,28 @@ "arguments": [ "-ndart2js-${system}-${runtime}", "--dart2js-batch", - "--reset-browser-configuration" - ], - "tests": ["pkg"] + "--reset-browser-configuration", + "pkg" + ] }, { "name": "dart2js observatory-ui tests", "arguments": [ "-ndart2js-${system}-${runtime}", "--dart2js-batch", - "--reset-browser-configuration" - ], - "tests": ["observatory_ui"] + "--reset-browser-configuration", + "observatory_ui" + ] }, { "name": "dart2js extra tests", "arguments": [ "-ndart2js-${system}-${runtime}", "--dart2js-batch", - "--reset-browser-configuration" - ], - "tests": ["dart2js_extra","dart2js_native"] + "--reset-browser-configuration", + "dart2js_extra", + "dart2js_native" + ] } ] }, @@ -1036,9 +1038,9 @@ "arguments": [ "-ndart2js-faststartup-${system}-${runtime}", "--dart2js-batch", - "--reset-browser-configuration" + "--reset-browser-configuration", + "--exclude_suite=observatory_ui" ], - "exclude_tests": ["observatory_ui"], "shards": 6, "fileset": "dart2js" }, @@ -1058,27 +1060,28 @@ "arguments": [ "-ndart2js-faststartup-${system}-${runtime}", "--dart2js-batch", - "--reset-browser-configuration" - ], - "tests": ["pkg"] + "--reset-browser-configuration", + "pkg" + ] }, { "name": "dart2js fast-startup observatory-ui tests", "arguments": [ "-ndart2js-faststartup-${system}-${runtime}", "--dart2js-batch", - "--reset-browser-configuration" - ], - "tests": ["observatory_ui"] + "--reset-browser-configuration", + "observatory_ui" + ] }, { "name": "dart2js fast-startup extra tests", "arguments": [ "-ndart2js-faststartup-${system}-${runtime}", "--dart2js-batch", - "--reset-browser-configuration" - ], - "tests": ["dart2js_extra","dart2js_native"] + "--reset-browser-configuration", + "dart2js_extra", + "dart2js_native" + ] } ] }, @@ -1097,9 +1100,9 @@ "name": "dart2js tests", "arguments": [ "-ndart2js-minified-linux-d8", - "--dart2js-batch" + "--dart2js-batch", + "--exclude_suite=observatory_ui" ], - "exclude_tests": ["observatory_ui"], "shards": 6, "fileset": "dart2js" }, @@ -1107,9 +1110,9 @@ "name": "dart2js fast-startup tests", "arguments": [ "-ndart2js-minified-faststartup-linux-d8", - "--dart2js-batch" + "--dart2js-batch", + "--exclude_suite=observatory_ui" ], - "exclude_tests": ["observatory_ui"], "shards": 6, "fileset": "dart2js" }, @@ -1117,49 +1120,51 @@ "name": "dart2js package tests", "arguments": [ "-ndart2js-minified-linux-d8", - "--dart2js-batch" - ], - "tests": ["pkg"] + "--dart2js-batch", + "pkg" + ] }, { "name": "dart2js observatory-ui tests", "arguments": [ "-ndart2js-minified-linux-d8", - "--dart2js-batch" - ], - "tests": ["observatory_ui"] + "--dart2js-batch", + "observatory_ui" + ] }, { "name": "dart2js extra tests", "arguments": [ "-ndart2js-minified-linux-d8", - "--dart2js-batch" - ], - "tests": ["dart2js_extra","dart2js_native"] + "--dart2js-batch", + "dart2js_extra", + "dart2js_native" + ] }, { "name": "dart2js fast-startup package tests", "arguments": [ "-ndart2js-minified-faststartup-linux-d8", - "--dart2js-batch" - ], - "tests": ["pkg"] + "--dart2js-batch", + "pkg" + ] }, { "name": "dart2js fast-startup observatory-ui tests", "arguments": [ "-ndart2js-minified-faststartup-linux-d8", - "--dart2js-batch" - ], - "tests": ["observatory_ui"] + "--dart2js-batch", + "observatory_ui" + ] }, { "name": "dart2js fast-startup extra tests", "arguments": [ "-ndart2js-minified-faststartup-linux-d8", - "--dart2js-batch" - ], - "tests": ["dart2js_extra","dart2js_native"] + "--dart2js-batch", + "dart2js_extra", + "dart2js_native" + ] } ] }, @@ -1179,9 +1184,9 @@ "arguments": [ "-ndart2js-minified-csp-linux-chrome", "--dart2js-batch", - "--reset-browser-configuration" + "--reset-browser-configuration", + "--exclude_suite=observatory_ui" ], - "exclude_tests": ["observatory_ui"], "shards": 4, "fileset": "dart2js" }, @@ -1190,9 +1195,9 @@ "arguments": [ "-ndart2js-minified-faststartup-csp-linux-chrome", "--dart2js-batch", - "--reset-browser-configuration" + "--reset-browser-configuration", + "--exclude_suite=observatory_ui" ], - "exclude_tests": ["observatory_ui"], "shards": 4, "fileset": "dart2js" }, @@ -1201,53 +1206,55 @@ "arguments": [ "-ndart2js-minified-csp-linux-chrome", "--dart2js-batch", - "--reset-browser-configuration" - ], - "tests": ["pkg"] + "--reset-browser-configuration", + "pkg" + ] }, { "name": "dart2js observatory-ui tests", "arguments": [ "-ndart2js-minified-csp-linux-chrome", "--dart2js-batch", - "--reset-browser-configuration" - ], - "tests": ["observatory_ui"] + "--reset-browser-configuration", + "observatory_ui" + ] }, { "name": "dart2js extra tests", "arguments": [ "-ndart2js-minified-csp-linux-chrome", - "--dart2js-batch" - ], - "tests": ["dart2js_extra","dart2js_native"] + "--dart2js-batch", + "dart2js_extra", + "dart2js_native" + ] }, { "name": "dart2js fast-startup package tests", "arguments": [ "-ndart2js-minified-faststartup-csp-linux-chrome", "--dart2js-batch", - "--reset-browser-configuration" - ], - "tests": ["pkg"] + "--reset-browser-configuration", + "pkg" + ] }, { "name": "dart2js fast-startup observatory-ui tests", "arguments": [ "-ndart2js-minified-faststartup-csp-linux-chrome", "--dart2js-batch", - "--reset-browser-configuration" - ], - "tests": ["observatory_ui"] + "--reset-browser-configuration", + "observatory_ui" + ] }, { "name": "dart2js fast-startup extra tests", "arguments": [ "-ndart2js-minified-faststartup-csp-linux-chrome", "--dart2js-batch", - "--reset-browser-configuration" - ], - "tests": ["dart2js_extra","dart2js_native"] + "--reset-browser-configuration", + "dart2js_extra", + "dart2js_native" + ] } ] }, @@ -1615,14 +1622,16 @@ { "name": "package unit tests", "arguments": [ - "-nunittest-asserts-${system}"], - "tests": ["pkg"] + "-nunittest-asserts-${system}", + "pkg" + ] }, { "name": "third_party pkg_tested unit tests", "arguments": [ - "-nunittest-asserts-${system}"], - "tests": ["pkg_tested"] + "-nunittest-asserts-${system}", + "pkg_tested" + ] }, { "name": "pub integration tests",