8282011: test/jdk/tools/jpackage/windows/WinL10nTest.java test fails …

…if light.exe is not in %PATH% Backport-of: 0b00ce17cd6b530d9394e79ac8b07208cd4b92f5
openjdk · Sep 27, 2023 · cbdacc2 · cbdacc2 · openjdk-notifier · Sep 27, 2023
1 parent f79ed4d
commit cbdacc2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/test/jdk/tools/jpackage/windows/WinL10nTest.java b/test/jdk/tools/jpackage/windows/WinL10nTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -94,8 +94,11 @@ public static List<Object[]> data() {
 
     private final static Stream<String> getLightCommandLine(
             Executor.Result result) {
-        return result.getOutput().stream()
-                .filter(s -> s.trim().startsWith("light.exe"));
+        return result.getOutput().stream().filter(s -> {
+            s = s.trim();
+            return s.startsWith("light.exe") || ((s.contains("\\light.exe ")
+                    && s.contains(" -out ")));
+        });
     }
 
     @Test