infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-10 10:28:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Jesper Wilhelmsson 2017-08-22 20:31:36 +00:00
commit 0c8dc55148
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hotspot/test/TEST.ROOT
View File

@ -54,8 +54,8 @@ requires.properties= \
vm.aot \
vm.cds
# Tests using jtreg 4.2 b07 features
requiredVersion=4.2 b07
# Minimum jtreg version
requiredVersion=4.2 b08
# Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../ notation to reach them

10
hotspot/test/runtime/Metaspace/FragmentMetaspaceSimple.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2017, 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,10 +21,12 @@
* questions.
*/
// ClassFileInstaller is needed to place test.Empty into well-known place
/**
* @test
* @library classes
* @library /test/lib classes
* @build test.Empty
* @run driver ClassFileInstaller test.Empty
* @run main/othervm/timeout=200 FragmentMetaspaceSimple
*/
@ -51,8 +53,8 @@ public class FragmentMetaspaceSimple {
long startTime = System.currentTimeMillis();
ArrayList<ClassLoader> cls = new ArrayList<>();
char sep = File.separatorChar;
String fileName = "classes" + sep + "test" + sep + "Empty.class";
File file = new File(System.getProperty("test.classes",".") + sep + fileName);
String fileName = "test" + sep + "Empty.class";
File file = new File(fileName);
byte buff[] = read(file);
int i = 0;