Skip to content

Commit

Permalink
8304063: tools/jpackage/share/AppLauncherEnvTest.java fails when chec…
Browse files Browse the repository at this point in the history 
…king LD_LIBRARY_PATH

Reviewed-by: asemenyuk, almatvee
  • Loading branch information
@MBaesken
MBaesken committed Mar 17, 2023
1 parent 36995c5 commit ebac7ee
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions test/jdk/tools/jpackage/share/AppLauncherEnvTest.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2023, 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 All @@ -26,6 +26,7 @@
import java.util.List;
import java.util.Optional;
import java.util.function.BiFunction;
import java.util.stream.Stream;
import jdk.jpackage.test.JPackageCommand;
import jdk.jpackage.test.Annotations.Test;
import jdk.jpackage.test.Executor;
Expand Down Expand Up @@ -83,8 +84,10 @@ public static void test() throws Exception {
final String expectedEnvVarValue = Optional.ofNullable(System.getenv(
envVarName)).orElse("") + File.pathSeparator + appDir;

TKit.assertEquals(expectedEnvVarValue, actualEnvVarValue, String.format(
"Check value of %s env variable", envVarName));
TKit.assertTextStream(expectedEnvVarValue)
.predicate(TKit.isLinux() ? String::endsWith : String::equals)
.label(String.format("value of %s env variable", envVarName))
.apply(Stream.of(actualEnvVarValue));

final String javaLibraryPath = getValue.apply(2, "java.library.path");
TKit.assertTrue(
Expand Down

3 comments on commit ebac7ee

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@MBaesken
Copy link
Member Author

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 ebac7ee Mar 20, 2023

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch MBaesken-backport-ebac7eec 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 ebac7eec from the openjdk/jdk repository.

The commit being backported was authored by Matthias Baesken on 17 Mar 2023 and was reviewed by Alexey Semenyuk and 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 MBaesken-backport-ebac7eec:MBaesken-backport-ebac7eec
$ git checkout MBaesken-backport-ebac7eec
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev MBaesken-backport-ebac7eec

Please sign in to comment.