Fix command line argument splitting issue for conformance tests.

PiperOrigin-RevId: 912731724

Author: jnthntatum

conformance/run.bzl

@@ -56,7 +56,7 @@ def _conformance_test_name(name, optimize, recursive):
         ],
     )
 
-def _conformance_test_args(modern, optimize, recursive, select_opt, skip_check, skip_tests, dashboard):
+def _conformance_test_args(modern, optimize, recursive, select_opt, skip_check, dashboard):
     args = []
     if modern:
         args.append("--modern")
@@ -70,18 +70,18 @@ def _conformance_test_args(modern, optimize, recursive, select_opt, skip_check,
         args.append("--skip_check")
     else:
         args.append("--noskip_check")
-    args.append("--skip_tests=\"{}\"".format(",".join(_expand_tests_to_skip(skip_tests))))
     if dashboard:
         args.append("--dashboard")
     return args
 
 def _conformance_test(name, data, modern, optimize, recursive, select_opt, skip_check, skip_tests, tags, dashboard):
     cc_test(
         name = _conformance_test_name(name, optimize, recursive),
-        args = _conformance_test_args(modern, optimize, recursive, select_opt, skip_check, skip_tests, dashboard) + ["$(location " + test + ")" for test in data] + select(
+        args = _conformance_test_args(modern, optimize, recursive, select_opt, skip_check, dashboard) + ["$(location " + test + ")" for test in data],
+        env = select(
             {
-                "@platforms//os:windows": ["--skip_tests=\"{}\"".format(",".join(skip_tests + _TESTS_TO_SKIP_WINDOWS))],
-                "//conditions:default": ["--skip_tests=\"{}\"".format(",".join(skip_tests))],
+                "@platforms//os:windows": {"CEL_SKIP_TESTS": ",".join(skip_tests + _TESTS_TO_SKIP_WINDOWS)},
+                "//conditions:default": {"CEL_SKIP_TESTS": ",".join(skip_tests)},
             },
         ),
         data = data,

conformance/run.cc

@@ -42,6 +42,7 @@
 #include "absl/strings/cord.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
+#include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/span.h"
@@ -273,6 +274,13 @@ int main(int argc, char** argv) {
   {
     auto service = NewConformanceServiceFromFlags();
     auto tests_to_skip = absl::GetFlag(FLAGS_skip_tests);
+    if (const char* env_skip = std::getenv("CEL_SKIP_TESTS");
+        env_skip != nullptr) {
+      for (absl::string_view test :
+           absl::StrSplit(env_skip, ',', absl::SkipEmpty())) {
+        tests_to_skip.push_back(std::string(test));
+      }
+    }
     for (int argi = 1; argi < argc; argi++) {
       ABSL_CHECK_OK(RegisterTestsFromFile(service, tests_to_skip,
                                           absl::string_view(argv[argi])));