Remove test wrapper.

Now that bazelbuild/bazel#14500 is fixed it should no
longer be necessary.

elisp/BUILD

@@ -1,4 +1,4 @@
-# Copyright 2020, 2021 Google LLC
+# Copyright 2020, 2021, 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -258,7 +258,7 @@ cc_test(
     data = [
         "binary.cc",
         "binary.h",
-        ":test_wrap_launcher",
+        "//tests/wrap",
     ],
     features = LAUNCHER_FEATURES,
     linkopts = LINKOPTS,
@@ -270,26 +270,6 @@ cc_test(
     ],
 )
 
-# I think this wrapper is only necessary because of the changes made in
-# https://github.com/bazelbuild/bazel/commit/bfdfa6ebfd21b388f1c91f512291c848e1a92a96.
-# See https://github.com/bazelbuild/bazel/issues/14500.
-# TODO(phst): Remove this wrapper once
-# https://github.com/bazelbuild/bazel/issues/14500 is fixed.
-cc_binary(
-    name = "test_wrap_launcher",
-    testonly = 1,
-    srcs = ["test_wrap_launcher.cc"],
-    copts = LAUNCHER_COPTS,
-    data = ["//tests/wrap"],
-    features = LAUNCHER_FEATURES,
-    linkopts = LAUNCHER_LINKOPTS,
-    linkstatic = True,
-    deps = [
-        ":platform",
-        ":process",
-    ],
-)
-
 py_binary(
     name = "run_binary",
     srcs = ["run_binary.py"],

elisp/binary_test.cc

@@ -1,4 +1,4 @@
-// Copyright 2020, 2021 Google LLC
+// Copyright 2020, 2021, 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ using ::testing::Eq;
 TEST(Executor, RunBinaryWrap) {
   const absl::StatusOr<Runfiles> runfiles = Runfiles::CreateForTest();
   ASSERT_TRUE(runfiles.ok()) << runfiles.status();
-  NativeString wrapper = PHST_RULES_ELISP_NATIVE_LITERAL(
-      "phst_rules_elisp/elisp/test_wrap_launcher");
+  NativeString wrapper =
+      PHST_RULES_ELISP_NATIVE_LITERAL("phst_rules_elisp/tests/wrap/wrap");
 #ifdef PHST_RULES_ELISP_WINDOWS
   wrapper += L".exe";
 #endif