Add unit_tests to ToT coverage bots
Bug: chromium:40596295
Change-Id: I04010bd9ba848bb5ebed58beea93e448245e8789
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/5589840
Auto-Submit: Prakhar Asthana <pasthana@google.com>
Reviewed-by: Zhaoyang Li <zhaoyangli@chromium.org>
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
diff --git a/recipes/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTLinuxCoverage.json b/recipes/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTLinuxCoverage.json
index b6bd8f1..a9b1d99 100644
--- a/recipes/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTLinuxCoverage.json
+++ b/recipes/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTLinuxCoverage.json
@@ -335,12 +335,15 @@
"base_unittests",
"boringssl_crypto_tests",
"boringssl_ssl_tests",
+ "unit_tests",
"-c",
"[CACHE]/builder/src/out/Release/base_unittests",
"-c",
"[CACHE]/builder/src/out/Release/boringssl_crypto_tests",
"-c",
"[CACHE]/builder/src/out/Release/boringssl_ssl_tests",
+ "-c",
+ "[CACHE]/builder/src/out/Release/unit_tests",
"-b",
"[CACHE]/builder/src/out/Release",
"-o",
@@ -476,6 +479,38 @@
"--json-output",
"/path/to/tmp/json",
"copy",
+ "[CACHE]/builder/src/out/clang_tot_coverage_report/linux/logs/unit_tests_output.log",
+ "/path/to/tmp/"
+ ],
+ "cwd": "[CACHE]/builder",
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "chromium:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "read log output of unit_tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@unit_tests_output.log@aaa@@@",
+ "@@@STEP_LOG_LINE@unit_tests_output.log@bbb@@@",
+ "@@@STEP_LOG_END@unit_tests_output.log@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
"[CACHE]/builder/src/out/clang_tot_coverage_report/linux/summary.json",
"/path/to/tmp/"
],
diff --git a/recipes/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTMacCoverage.json b/recipes/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTMacCoverage.json
index f5125e2..a775f71 100644
--- a/recipes/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTMacCoverage.json
+++ b/recipes/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTMacCoverage.json
@@ -567,12 +567,15 @@
"base_unittests",
"boringssl_crypto_tests",
"boringssl_ssl_tests",
+ "unit_tests",
"-c",
"[CACHE]/builder/src/out/Release/base_unittests",
"-c",
"[CACHE]/builder/src/out/Release/boringssl_crypto_tests",
"-c",
"[CACHE]/builder/src/out/Release/boringssl_ssl_tests",
+ "-c",
+ "[CACHE]/builder/src/out/Release/unit_tests",
"-b",
"[CACHE]/builder/src/out/Release",
"-o",
@@ -708,6 +711,38 @@
"--json-output",
"/path/to/tmp/json",
"copy",
+ "[CACHE]/builder/src/out/clang_tot_coverage_report/mac/logs/unit_tests_output.log",
+ "/path/to/tmp/"
+ ],
+ "cwd": "[CACHE]/builder",
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "chromium:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "read log output of unit_tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@unit_tests_output.log@aaa@@@",
+ "@@@STEP_LOG_LINE@unit_tests_output.log@bbb@@@",
+ "@@@STEP_LOG_END@unit_tests_output.log@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
"[CACHE]/builder/src/out/clang_tot_coverage_report/mac/summary.json",
"/path/to/tmp/"
],
diff --git a/recipes/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTWindowsCoverage.json b/recipes/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTWindowsCoverage.json
index 8ae19a8..78b229f 100644
--- a/recipes/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTWindowsCoverage.json
+++ b/recipes/recipes/chromium_clang_coverage_tot.expected/full_chromium_clang_ToTWindowsCoverage.json
@@ -335,12 +335,15 @@
"base_unittests",
"boringssl_crypto_tests",
"boringssl_ssl_tests",
+ "unit_tests",
"-c",
"[CACHE]\\builder\\src\\out\\Release_x64\\base_unittests",
"-c",
"[CACHE]\\builder\\src\\out\\Release_x64\\boringssl_crypto_tests",
"-c",
"[CACHE]\\builder\\src\\out\\Release_x64\\boringssl_ssl_tests",
+ "-c",
+ "[CACHE]\\builder\\src\\out\\Release_x64\\unit_tests",
"-b",
"[CACHE]\\builder\\src\\out\\Release_x64",
"-o",
@@ -476,6 +479,38 @@
"--json-output",
"/path/to/tmp/json",
"copy",
+ "[CACHE]\\builder\\src\\out\\clang_tot_coverage_report\\win\\logs\\unit_tests_output.log",
+ "/path/to/tmp/"
+ ],
+ "cwd": "[CACHE]\\builder",
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "chromium:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "read log output of unit_tests",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@unit_tests_output.log@aaa@@@",
+ "@@@STEP_LOG_LINE@unit_tests_output.log@bbb@@@",
+ "@@@STEP_LOG_END@unit_tests_output.log@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
"[CACHE]\\builder\\src\\out\\clang_tot_coverage_report\\win\\summary.json",
"/path/to/tmp/"
],
diff --git a/recipes/recipes/chromium_clang_coverage_tot.py b/recipes/recipes/chromium_clang_coverage_tot.py
index 7f61bc7..2e249e9 100644
--- a/recipes/recipes/chromium_clang_coverage_tot.py
+++ b/recipes/recipes/chromium_clang_coverage_tot.py
@@ -60,7 +60,8 @@
# Sample targets that are used to test the coverage script against clang tot
# coverage tools.
SAMPLE_TARGETS = [
- 'base_unittests', 'boringssl_crypto_tests', 'boringssl_ssl_tests'
+ 'base_unittests', 'boringssl_crypto_tests', 'boringssl_ssl_tests',
+ 'unit_tests'
]
def RunSteps(api):
