Skip to content

Commit 514f66a

Browse files
yz-zhignoliyil
authored andcommitted
[run host script] update stderr output for host script.
- Use subprocess.PIPE for subprocess in order to show subprocess error in stdout correctly. - Formate stderr with .decode("utf-8") - Remove the if statements that checks if host_script is defined. The template currently fails if host_script is not defined. - Add an else statement in src/testing/system-validaion/ui/BUILD.gn for when building with asan variant. It seems that GN will error with unresolved target for flatland_view_provider_with_host_script. Bug: 116493 Change-Id: I6a7e2aa218af7bdd6d6070f84e13acbf2fc25b35 Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/774007 Reviewed-by: Oliver Newman <olivernewman@google.com> Reviewed-by: Satsuki Ueno <satsukiu@google.com> Reviewed-by: Marc-Antoine Ruel <maruel@google.com> Commit-Queue: Yuan Zhi <yuanzhi@google.com>
1 parent 2199924 commit 514f66a

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

build/testing/run_target_test_and_host_script.gni

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,18 @@ template("run_target_test_and_host_script") {
9393
}
9494
}
9595

96-
if (defined(invoker.host_script)) {
97-
_script_bin_name =
98-
get_path_info(get_label_info(invoker.host_script, "target_out_dir"),
99-
"file")
100-
host_test_data("host_script_for_${target_name}") {
101-
sources = [ "${root_out_dir}/${_script_bin_name}" ]
102-
deps = [ invoker.host_script ]
103-
}
104-
_data_deps += [ ":host_script_for_${target_name}" ]
105-
_args += [
106-
"--host-script-bin",
107-
rebase_path("${root_out_dir}/${_script_bin_name}", root_build_dir),
108-
]
96+
_script_bin_name =
97+
get_path_info(get_label_info(invoker.host_script, "target_out_dir"),
98+
"file")
99+
host_test_data("host_script_for_${target_name}") {
100+
sources = [ "${root_out_dir}/${_script_bin_name}" ]
101+
deps = [ invoker.host_script ]
109102
}
103+
_data_deps += [ ":host_script_for_${target_name}" ]
104+
_args += [
105+
"--host-script-bin",
106+
rebase_path("${root_out_dir}/${_script_bin_name}", root_build_dir),
107+
]
110108

111109
if (defined(invoker.host_script_args)) {
112110
foreach(_host_script_arg, invoker.host_script_args) {

build/testing/run_target_test_and_host_script.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def run_target_test(
4242
outdir
4343
]
4444
args += ffx_test_args
45-
return subprocess.run(args, stderr=sys.stdout)
45+
return subprocess.run(args, text=True, stderr=subprocess.PIPE)
4646

4747

4848
def get_test_suite_artifact_dir(
@@ -78,7 +78,8 @@ def run_host_script(
7878
substituted_args = []
7979
for arg in script_args:
8080
substituted_args.append(do_variable_substitution(arg))
81-
return subprocess.run([script_bin] + substituted_args, stderr=sys.stdout)
81+
return subprocess.run(
82+
[script_bin] + substituted_args, text=True, stderr=subprocess.PIPE)
8283

8384

8485
class RunTargetTestWithHostScript(unittest.TestCase):
@@ -97,7 +98,7 @@ def runTest(self):
9798
self.args.ffx_test_args)
9899
self.assertEqual(
99100
self.test_status.returncode, 0,
100-
"test returned non-zero status, error: %s" %
101+
"test returned non-zero status, stderr: %s" %
101102
self.test_status.stderr)
102103

103104
def tearDown(self):
@@ -111,7 +112,7 @@ def tearDown(self):
111112
self.args.host_script_bin, self.args.host_script_args)
112113
self.assertEqual(
113114
script_status.returncode, 0,
114-
"host script returned non-zero status, error: %s" %
115+
"host script returned non-zero status, stderr: %s" %
115116
script_status.stderr)
116117

117118

src/testing/system-validation/ui/BUILD.gn

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,7 @@ if (is_host && target_cpu == "x64" && !is_asan) {
9696
]
9797
environments = [ emu_env ]
9898
}
99+
} else {
100+
group("flatland_view_provider_with_host_script") {
101+
}
99102
}

0 commit comments

Comments
 (0)