8240604: Rewrite sun/management/jmxremote/bootstrap/CustomLauncherTest.java test to make binaries from source file
Reviewed-by: iignatyev
This commit is contained in:
Alexander Scherbatiy
parent
cc9470ece1
commit
cd7d175001
@ -55,7 +55,7 @@ BUILD_JDK_JTREG_EXECUTABLES_CFLAGS_exeJliLaunchTest := \
|
||||
|
||||
# Platform specific setup
|
||||
ifeq ($(call isTargetOs, windows), true)
|
||||
BUILD_JDK_JTREG_EXCLUDE += libDirectIO.c libInheritedChannel.c
|
||||
BUILD_JDK_JTREG_EXCLUDE += libDirectIO.c libInheritedChannel.c exelauncher.c
|
||||
|
||||
WIN_LIB_JAVA := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib
|
||||
BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := $(WIN_LIB_JAVA)
|
||||
@ -69,14 +69,17 @@ else
|
||||
BUILD_JDK_JTREG_EXCLUDE += exerevokeall.c
|
||||
ifeq ($(call isTargetOs, linux), true)
|
||||
BUILD_JDK_JTREG_LIBRARIES_LIBS_libInheritedChannel := -ljava
|
||||
BUILD_JDK_JTREG_EXECUTABLES_LIBS_exelauncher := -ldl
|
||||
else ifeq ($(call isTargetOs, solaris), true)
|
||||
BUILD_JDK_JTREG_LIBRARIES_LIBS_libInheritedChannel := -ljava -lsocket -lnsl
|
||||
BUILD_JDK_JTREG_EXECUTABLES_LIBS_exelauncher := -lthread -ldl
|
||||
endif
|
||||
BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJliLaunchTest := -ljli
|
||||
BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeCallerAccessTest := -ljvm
|
||||
endif
|
||||
|
||||
ifeq ($(call isTargetOs, macosx), true)
|
||||
BUILD_JDK_JTREG_EXCLUDE += exelauncher.c
|
||||
BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libTestMainKeyWindow := -ObjC
|
||||
BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestMainKeyWindow := -framework JavaVM \
|
||||
-framework Cocoa -framework JavaNativeFoundation
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013, 2020, 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
|
||||
@ -21,22 +21,16 @@
|
||||
* questions.
|
||||
*/
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.FileSystem;
|
||||
import java.nio.file.FileSystems;
|
||||
import jdk.test.lib.Utils;
|
||||
import jdk.test.lib.Platform;
|
||||
import jdk.test.lib.process.ProcessTools;
|
||||
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.LinkOption;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.nio.file.attribute.PosixFilePermission;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
|
||||
import jdk.test.lib.process.ProcessTools;
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 6434402 8004926
|
||||
@ -47,80 +41,35 @@ import jdk.test.lib.process.ProcessTools;
|
||||
* jdk.attach
|
||||
* jdk.management.agent/jdk.internal.agent
|
||||
*
|
||||
* @requires (os.family == "linux" | os.family == "solaris")
|
||||
* @build TestManager TestApplication CustomLauncherTest
|
||||
* @run main/othervm CustomLauncherTest
|
||||
* @run main/othervm/native CustomLauncherTest
|
||||
*/
|
||||
public class CustomLauncherTest {
|
||||
private static final String TEST_CLASSPATH = System.getProperty("test.class.path");
|
||||
private static final String TEST_JDK = System.getProperty("test.jdk");
|
||||
private static final String WORK_DIR = System.getProperty("user.dir");
|
||||
|
||||
private static final String TEST_SRC = System.getProperty("test.src");
|
||||
private static final String OSNAME = System.getProperty("os.name");
|
||||
private static final String ARCH;
|
||||
static {
|
||||
// magic with os.arch
|
||||
String osarch = System.getProperty("os.arch");
|
||||
switch (osarch) {
|
||||
case "i386":
|
||||
case "i486":
|
||||
case "i586":
|
||||
case "i686":
|
||||
case "i786":
|
||||
case "i886":
|
||||
case "i986": {
|
||||
ARCH = "i586";
|
||||
break;
|
||||
}
|
||||
case "x86_64":
|
||||
case "amd64": {
|
||||
ARCH = "amd64";
|
||||
break;
|
||||
}
|
||||
case "sparc":
|
||||
ARCH = "sparcv9";
|
||||
break;
|
||||
default: {
|
||||
ARCH = osarch;
|
||||
}
|
||||
}
|
||||
}
|
||||
public static final String TEST_NATIVE_PATH = System.getProperty("test.nativepath");
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
if (TEST_CLASSPATH == null || TEST_CLASSPATH.isEmpty()) {
|
||||
if (".".equals(Utils.TEST_CLASS_PATH)) {
|
||||
System.out.println("Test is designed to be run from jtreg only");
|
||||
return;
|
||||
}
|
||||
|
||||
if (getPlatform() == null) {
|
||||
System.out.println("Test not designed to run on this operating " +
|
||||
"system (" + OSNAME + "), skipping...");
|
||||
return;
|
||||
}
|
||||
|
||||
final FileSystem FS = FileSystems.getDefault();
|
||||
|
||||
Path libjvmPath = findLibjvm(FS);
|
||||
if (libjvmPath == null) {
|
||||
throw new Error("Unable to locate 'libjvm.so' in " + TEST_JDK);
|
||||
}
|
||||
|
||||
Path libjvm = Platform.jvmLibDir().resolve("libjvm.so");
|
||||
Process serverPrc = null, clientPrc = null;
|
||||
|
||||
try {
|
||||
String[] launcher = getLauncher();
|
||||
|
||||
if (launcher == null) return; // launcher not available for the tested platform; skip
|
||||
String launcher = getLauncher();
|
||||
|
||||
System.out.println("Starting custom launcher:");
|
||||
System.out.println("=========================");
|
||||
System.out.println(" launcher : " + launcher[0]);
|
||||
System.out.println(" libjvm : " + libjvmPath.toString());
|
||||
System.out.println(" classpath : " + TEST_CLASSPATH);
|
||||
System.out.println(" launcher : " + launcher);
|
||||
System.out.println(" libjvm : " + libjvm);
|
||||
System.out.println(" classpath : " + Utils.TEST_CLASS_PATH);
|
||||
ProcessBuilder server = new ProcessBuilder(
|
||||
launcher[1],
|
||||
libjvmPath.toString(),
|
||||
TEST_CLASSPATH,
|
||||
launcher,
|
||||
libjvm.toString(),
|
||||
Utils.TEST_CLASS_PATH,
|
||||
"TestApplication"
|
||||
);
|
||||
|
||||
@ -148,7 +97,7 @@ public class CustomLauncherTest {
|
||||
|
||||
ProcessBuilder client = ProcessTools.createJavaProcessBuilder(
|
||||
"-cp",
|
||||
TEST_CLASSPATH,
|
||||
Utils.TEST_CLASS_PATH,
|
||||
"--add-exports", "jdk.management.agent/jdk.internal.agent=ALL-UNNAMED",
|
||||
"TestManager",
|
||||
String.valueOf(serverPrc.pid()),
|
||||
@ -182,87 +131,8 @@ public class CustomLauncherTest {
|
||||
}
|
||||
}
|
||||
|
||||
private static Path findLibjvm(FileSystem FS) {
|
||||
Path libjvmPath = findLibjvm(FS.getPath(TEST_JDK, "lib"));
|
||||
return libjvmPath;
|
||||
}
|
||||
|
||||
private static Path findLibjvm(Path libPath) {
|
||||
// libjvm.so -> server/libjvm.so -> client/libjvm.so
|
||||
Path libjvmPath = libPath.resolve("libjvm.so");
|
||||
if (isFileOk(libjvmPath)) {
|
||||
return libjvmPath;
|
||||
}
|
||||
libjvmPath = libPath.resolve("server/libjvm.so");
|
||||
if (isFileOk(libjvmPath)) {
|
||||
return libjvmPath;
|
||||
}
|
||||
libjvmPath = libPath.resolve("client/libjvm.so");
|
||||
if (isFileOk(libPath)) {
|
||||
return libjvmPath;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static boolean isFileOk(Path path) {
|
||||
return Files.isRegularFile(path) && Files.isReadable(path);
|
||||
}
|
||||
|
||||
private static String getPlatform() {
|
||||
String platform = null;
|
||||
switch (OSNAME.toLowerCase()) {
|
||||
case "linux": {
|
||||
platform = "linux";
|
||||
break;
|
||||
}
|
||||
case "sunos": {
|
||||
platform = "solaris";
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
platform = null;
|
||||
}
|
||||
}
|
||||
|
||||
return platform;
|
||||
}
|
||||
|
||||
private static String[] getLauncher() throws IOException {
|
||||
String platform = getPlatform();
|
||||
if (platform == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
String launcher = TEST_SRC + File.separator + platform + "-" + ARCH +
|
||||
File.separator + "launcher";
|
||||
|
||||
final FileSystem FS = FileSystems.getDefault();
|
||||
Path launcherPath = FS.getPath(launcher);
|
||||
|
||||
final boolean hasLauncher = Files.isRegularFile(launcherPath, LinkOption.NOFOLLOW_LINKS)&&
|
||||
Files.isReadable(launcherPath);
|
||||
if (!hasLauncher) {
|
||||
System.out.println("Launcher [" + launcher + "] does not exist. Skipping the test.");
|
||||
return null;
|
||||
}
|
||||
|
||||
// It is impossible to store an executable file in the source control
|
||||
// We need to copy the launcher to the working directory
|
||||
// and set the executable flag
|
||||
Path localLauncherPath = FS.getPath(WORK_DIR, "launcher");
|
||||
Files.copy(launcherPath, localLauncherPath,
|
||||
StandardCopyOption.REPLACE_EXISTING);
|
||||
if (!Files.isExecutable(localLauncherPath)) {
|
||||
Set<PosixFilePermission> perms = new HashSet<>(
|
||||
Files.getPosixFilePermissions(
|
||||
localLauncherPath,
|
||||
LinkOption.NOFOLLOW_LINKS
|
||||
)
|
||||
);
|
||||
perms.add(PosixFilePermission.OWNER_EXECUTE);
|
||||
Files.setPosixFilePermissions(localLauncherPath, perms);
|
||||
}
|
||||
return new String[] {launcher, localLauncherPath.toAbsolutePath().toString()};
|
||||
private static String getLauncher() {
|
||||
Path launcherPath = Paths.get(TEST_NATIVE_PATH, "launcher");
|
||||
return launcherPath.toAbsolutePath().toString();
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,80 +0,0 @@
|
||||
# Copyright (c) 2006, 2007, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
|
||||
#
|
||||
# This Makefile is used to generate versions of the launcher program for
|
||||
# use by the CustomLauncherTest. The binaries are checked into SCCS
|
||||
# so this Makefile is not used as part of test run. It is provided to
|
||||
# make rebuilding the launcher binaries a relatively painless activity.
|
||||
#
|
||||
|
||||
#
|
||||
# Edit the following to reflect the current build environment.
|
||||
#
|
||||
# Architecture being built (initially one of: solaris-sparc, solaris-i586,
|
||||
# linux-i586.
|
||||
#
|
||||
PLATFORM=solaris
|
||||
ARCH=sparc
|
||||
OUTPUT_DIR =$(PLATFORM)-$(ARCH)
|
||||
|
||||
#
|
||||
# Path to C compiler
|
||||
#
|
||||
# As of 6/1/06:
|
||||
# Solaris CC=/java/devtools/$(ARCH)/SUNWspro/SS11/bin/cc
|
||||
# Linux CC=/usr/bin/gcc
|
||||
#
|
||||
CC=/java/devtools/$(ARCH)/SUNWspro/SS11/bin/cc
|
||||
|
||||
#
|
||||
# Include directory in JRE or JDK install
|
||||
#
|
||||
JINCLUDE=/java/re/jdk/1.6.0/latest/binaries/$(OUTPUT_DIR)/include
|
||||
|
||||
#
|
||||
# PLATFORM dependent flags
|
||||
#
|
||||
# On pre-Solaris 10, -lthread is required.
|
||||
#
|
||||
ifeq ($(PLATFORM), solaris)
|
||||
PLATFORM_LIBS= -lthread
|
||||
else
|
||||
PLATFORM_LIBS=
|
||||
endif
|
||||
|
||||
#
|
||||
# Targets
|
||||
#
|
||||
all: install
|
||||
|
||||
$(PLATFORM):
|
||||
mkdir $(OUTPUT_DIR) $(OUTPUT_DIR)/SCCS
|
||||
|
||||
install: $(PLATFORM)
|
||||
$(CC) -I$(JINCLUDE) -I$(JINCLUDE)/$(PLATFORM) \
|
||||
-o $(OUTPUT_DIR)/launcher launcher.c $(PLATFORM_LIBS) -ldl
|
||||
|
||||
clean:
|
||||
|
||||
|
||||
clobber: clean
|
||||
rm $(OUTPUT_DIR)/launcher
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2006, 2020, 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
|
||||
@ -22,11 +22,11 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* A minature launcher for use by CustomLauncherTest.sh. It sets
|
||||
* A miniature launcher for use by CustomLauncherTest.java test. It sets
|
||||
* up the absolute minimal execution environment.
|
||||
*/
|
||||
#include <stdlib.h>
|
||||
#include <strings.h>
|
||||
#include <string.h>
|
||||
#include <dlfcn.h>
|
||||
|
||||
#include "jni.h"
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user