This is an automated email from the ASF dual-hosted git repository.
Abacn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 7eef1304b19 Fix beamTestPipelineOptions quote loss on Windows for
ValidatesRunner tasks (#39365)
7eef1304b19 is described below
commit 7eef1304b19c5a47c12354476c4319df5183908d
Author: Elia Liu <[email protected]>
AuthorDate: Sat Jul 18 00:23:02 2026 +1000
Fix beamTestPipelineOptions quote loss on Windows for ValidatesRunner tasks
(#39365)
On Windows, Gradle passes -DbeamTestPipelineOptions=<compact JSON> to the
forked test JVM unquoted, so the Windows C runtime strips the JSON quotes
and TestPipeline fails to parse the options; every test in the task fails
at TestPipeline.create(). Consolidate the existing Windows quoting
treatment (BEAM-10682, BEAM-11365) into a shared helper and use it in
createPortableValidatesRunnerTask and
createCrossLanguageValidatesRunnerTask.
On non-Windows platforms the emitted JSON is unchanged.
Fixes #39332
---
.../org/apache/beam/gradle/BeamModulePlugin.groovy | 23 ++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index c0ae4feb590..3e7ffa89b74 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -96,6 +96,17 @@ class BeamModulePlugin implements Plugin<Project> {
}
}
+ // Serializes pipeline options to JSON for the beamTestPipelineOptions
system property.
+ // On Windows each option is wrapped in literal quotes so the JSON survives
the quote
+ // stripping applied to the forked test JVM's command line.
+ // See https://github.com/apache/beam/issues/39332.
+ static def toBeamTestPipelineOptionsJson(def options) {
+ if (System.properties['os.name'].toLowerCase().contains('windows')) {
+ return JsonOutput.toJson(options.collect { "\"$it\"" })
+ }
+ return JsonOutput.toJson(options)
+ }
+
/** A class defining the set of configurable properties accepted by
applyJavaNature. */
static class JavaNatureConfiguration {
/** Controls whether the spotbugs plugin is enabled and configured. */
@@ -2249,12 +2260,8 @@ class BeamModulePlugin implements Plugin<Project> {
}
}
- // Windows handles quotation marks differently
- if (pipelineOptionsString &&
System.properties['os.name'].toLowerCase().contains('windows')) {
- def allOptionsListFormatted = allOptionsList.collect { "\"$it\"" }
- pipelineOptionsStringFormatted =
JsonOutput.toJson(allOptionsListFormatted)
- } else if (pipelineOptionsString) {
- pipelineOptionsStringFormatted = JsonOutput.toJson(allOptionsList)
+ if (pipelineOptionsString) {
+ pipelineOptionsStringFormatted =
toBeamTestPipelineOptionsJson(allOptionsList)
}
systemProperties.beamTestPipelineOptions =
pipelineOptionsStringFormatted ?: pipelineOptionsString
@@ -2691,7 +2698,7 @@ class BeamModulePlugin implements Plugin<Project> {
if (config.jobServerConfig) {
beamTestPipelineOptions.add("--jobServerConfig=${config.jobServerConfig}")
}
- config.systemProperties.put("beamTestPipelineOptions",
JsonOutput.toJson(beamTestPipelineOptions))
+ config.systemProperties.put("beamTestPipelineOptions",
toBeamTestPipelineOptionsJson(beamTestPipelineOptions))
project.tasks.register(name, Test) {
group = "Verification"
description = "Validates the PortableRunner with JobServer
${config.jobServerDriver}"
@@ -2857,7 +2864,7 @@ class BeamModulePlugin implements Plugin<Project> {
def javaTask = project.tasks.register(config.name+"JavaUsing"+sdk,
Test) {
group = "Verification"
description = "Validates runner for cross-language capability of
using ${sdk} transforms from Java SDK"
- systemProperty "beamTestPipelineOptions",
JsonOutput.toJson(config.javaPipelineOptions)
+ systemProperty "beamTestPipelineOptions",
toBeamTestPipelineOptionsJson(config.javaPipelineOptions)
systemProperty "expansionJar", expansionJar
systemProperty "expansionPort", port
systemProperty "semiPersistDir", config.semiPersistDir
