Skip to content
This repository has been archived by the owner. It is now read-only.

8269486: CallerAccessTest fails for non server variant #159

Closed
Closed
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2021, 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
@@ -37,7 +37,6 @@
import java.io.File;
import java.util.Map;
import jdk.test.lib.Platform;
import jdk.test.lib.Utils;
import jdk.test.lib.process.OutputAnalyzer;

import java.io.IOException;
@@ -50,10 +49,8 @@ public static void main(String[] args) throws IOException {
ProcessBuilder pb = new ProcessBuilder(launcher.toString());
Map<String, String> env = pb.environment();

String libName = Platform.isWindows() ? "bin" : "lib";
Path libPath = Paths.get(Utils.TEST_JDK).resolve(libName);
String libDir = libPath.toAbsolutePath().toString();
String serverDir = libPath.resolve("server").toAbsolutePath().toString();
String libDir = Platform.libDir().toString();
String serverDir = Platform.jvmLibDir().toString();

This comment has been minimized.

@dholmes-ora

dholmes-ora Jun 28, 2021
Member Outdated

Perhaps vmDir would be a more suitable name?

This comment has been minimized.

@mychris

mychris Jun 28, 2021
Author Member Outdated

Makes sense, thank you.


// set up shared library path
String sharedLibraryPathEnvName = Platform.sharedLibraryPathVariableName();