Skip to content

Commit

Permalink
8282011: test/jdk/tools/jpackage/windows/WinL10nTest.java test fails …
Browse files Browse the repository at this point in the history
…if light.exe is not in %PATH%

Reviewed-by: almatvee
  • Loading branch information
Alexey Semenyuk committed Feb 16, 2022
1 parent 5ec7898 commit 0b00ce1
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions 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
Expand Down Expand Up @@ -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
Expand Down

3 comments on commit 0b00ce1

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 0b00ce1 Sep 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 0b00ce1 Sep 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch GoeLin-backport-0b00ce17 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 0b00ce17 from the openjdk/jdk repository.

The commit being backported was authored by Alexey Semenyuk on 16 Feb 2022 and was reviewed by Alexander Matveev.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git GoeLin-backport-0b00ce17:GoeLin-backport-0b00ce17
$ git checkout GoeLin-backport-0b00ce17
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git GoeLin-backport-0b00ce17

Please sign in to comment.