From 5b9de15b8bb2f45f1b25bbe1389d49d07db1af61 Mon Sep 17 00:00:00 2001
From: Xavier Deguillard <xavierd@fb.com>
Date: Thu, 7 Jul 2022 16:39:17 -0700
Subject: [PATCH] cmake: kill testpilot on Windows

Summary:
TPX is now available on Windows, the testpilot code is thus no longer
necessary.

Reviewed By: fanzeyi

Differential Revision: D37476157

fbshipit-source-id: 885881de2e06eab4990c6c96dcef8f51614a17f5
---
 build/fbcode_builder/getdeps/builder.py | 47 +++++++------------------
 1 file changed, 12 insertions(+), 35 deletions(-)

diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py
index 3bfc95304e..3db3adf30c 100644
--- a/build/fbcode_builder/getdeps/builder.py
+++ b/build/fbcode_builder/getdeps/builder.py
@@ -816,10 +816,8 @@ if __name__ == "__main__":
             # better signals for flaky tests.
             retry = 0
 
-        testpilot = path_search(env, "testpilot")
-        # TODO(xavierd): once tpx is really available on Windows, remove this.
-        tpx = path_search(env, "tpx") if sys.platform != "win32" else None
-        if (tpx or testpilot) and not no_testpilot:
+        tpx = path_search(env, "tpx")
+        if tpx and not no_testpilot:
             buck_test_info = list_tests()
             import os
 
@@ -835,41 +833,20 @@ if __name__ == "__main__":
             from sys import platform
 
             with start_run(env["FBSOURCE_HASH"]) as run_id:
-                if platform == "win32":
-                    machine_suffix = self.build_opts.host_type.as_tuple_string()
-                    testpilot_args = [
-                        "parexec-testinfra.exe",
-                        "C:/tools/testpilot/sc_testpilot.par",
-                        # Need to force the repo type otherwise testpilot on windows
-                        # can be confused (presumably sparse profile related)
-                        "--force-repo",
-                        "fbcode",
-                        "--force-repo-root",
-                        self.build_opts.fbsource_dir,
-                        "--buck-test-info",
-                        buck_test_info_name,
-                        "--retry=%d" % retry,
-                        "-j=%s" % str(self.num_jobs),
-                        "--test-config",
-                        "platform=%s" % machine_suffix,
-                        "buildsystem=getdeps",
-                        "--return-nonzero-on-failures",
-                    ]
-                else:
-                    testpilot_args = [
-                        tpx,
-                        "--force-local-execution",
-                        "--buck-test-info",
-                        buck_test_info_name,
-                        "--retry=%d" % retry,
-                        "-j=%s" % str(self.num_jobs),
-                        "--print-long-results",
-                    ]
+                testpilot_args = [
+                    tpx,
+                    "--force-local-execution",
+                    "--buck-test-info",
+                    buck_test_info_name,
+                    "--retry=%d" % retry,
+                    "-j=%s" % str(self.num_jobs),
+                    "--print-long-results",
+                ]
 
                 if owner:
                     testpilot_args += ["--contacts", owner]
 
-                if tpx and env:
+                if env:
                     testpilot_args.append("--env")
                     testpilot_args.extend(f"{key}={val}" for key, val in env.items())