changeset 13552:b81e27d21310

Merge
author jwilhelm
date Tue, 22 Aug 2017 20:31:36 +0000
parents e0c0f9a12318 aa16f40d1859
children a54a1bd7f1d3
files
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/test/TEST.ROOT	Tue Aug 22 19:24:42 2017 +0000
+++ b/test/TEST.ROOT	Tue Aug 22 20:31:36 2017 +0000
@@ -54,8 +54,8 @@
     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
--- a/test/runtime/Metaspace/FragmentMetaspaceSimple.java	Tue Aug 22 19:24:42 2017 +0000
+++ b/test/runtime/Metaspace/FragmentMetaspaceSimple.java	Tue Aug 22 20:31:36 2017 +0000
@@ -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 @@
         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;