Commit 48888f4a authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot

Revert "Skip 'dep:chrome_internal' Tast tests if we're not building w/ is_chrome_branded."

This reverts commit ad780388.

Reason for revert: "No tests matched by pattern(s) ..."

eg: https://chromium-swarm.appspot.com/task?id=4527b399d8f02d10
And it didn't fail the task >.<

Original change's description:
> Skip 'dep:chrome_internal' Tast tests if we're not building w/ is_chrome_branded.
> 
> So that no dep:chrome_internal tests are ran if they don't have the
> needed internal bits.
> 
> Bug: 947531
> Change-Id: I060734d2fe05c878d16f2c6a63815bd0abbb554c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1637644
> Reviewed-by: Dan Erat <derat@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Commit-Queue: Ben Pastene <bpastene@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#665158}

TBR=derat@chromium.org,dpranke@chromium.org,nya@chromium.org,bpastene@chromium.org

Change-Id: I87ec89cfa30237e543f2f3e1830eb7f2b284bd83
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 947531
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1638290Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665169}
parent df13cdcb
......@@ -2,8 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chrome_build.gni")
assert(is_chromeos)
declare_args() {
......@@ -206,14 +204,8 @@ template("tast_test") {
# Default the expression to match any chrome-related test.
if (!defined(tast_attr_expr) && !defined(tast_tests)) {
# The following expression filters out all non-critical tests. See the link
# below for more details:
# https://chromium.googlesource.com/chromiumos/platform/tast/+/master/docs/test_attributes.md
tast_attr_expr =
"!disabled && !\"group:*\" && !informational && \"dep:chrome\""
if (!is_chrome_branded) {
tast_attr_expr += " && \"!dep:chrome_internal\""
}
"!disabled && !\"group:*\" && !informational" + " && (\"dep:chrome\")"
} else {
assert(defined(tast_attr_expr) != defined(tast_tests),
"Specify one of tast_tests or tast_attr_expr.")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment