From 5b5ae812bcd9b99e96880cd29e433134e462b6c7 Mon Sep 17 00:00:00 2001 From: Chad Austin Date: Wed, 9 Jun 2021 09:22:24 -0700 Subject: [PATCH] fix tpx command line when filtering is enabled Summary: The testpilot command line getdeps generated was not suitable for tpx when filtering. tpx would consider the passed test filter an environment variable. Reorder a few things to at least make filtering work. Reviewed By: fanzeyi Differential Revision: D28976061 fbshipit-source-id: 21c45b3a4a59711a2a5da36a1bd11b7b4871ec5d --- build/fbcode_builder/getdeps/builder.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 0f61f1c8d..0ecbe20bc 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -752,12 +752,15 @@ if __name__ == "__main__": "--print-long-results", ] + if owner: + testpilot_args += ["--contacts", owner] + if tpx and env: testpilot_args.append("--env") testpilot_args.extend(f"{key}={val}" for key, val in env.items()) - if owner: - testpilot_args += ["--contacts", owner] + if test_filter: + testpilot_args += ["--", test_filter] if schedule_type == "continuous": runs.append( @@ -797,9 +800,6 @@ if __name__ == "__main__": else: runs.append(["--collection", "oss-diff", "--purpose", "diff"]) - if test_filter: - testpilot_args += [test_filter] - for run in runs: self._run_cmd( testpilot_args + run,