Merge
authorchegar
Thu, 04 Jun 2015 19:00:56 +0100
changeset 30965 2d5e4788ee21
parent 30963 88469d06e03f (current diff)
parent 30964 613fbce96e32 (diff)
child 30966 a832d39b95a0
Merge
--- a/jdk/test/com/sun/jdi/AllLineLocations.java	Thu Jun 04 18:16:25 2015 +0100
+++ b/jdk/test/com/sun/jdi/AllLineLocations.java	Thu Jun 04 19:00:56 2015 +0100
@@ -27,7 +27,6 @@
  *  @summary Test ReferenceType.allLineLocations
  *  @author Gordon Hirsch
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g RefTypes.java
--- a/jdk/test/com/sun/jdi/ClassesByName.java	Thu Jun 04 18:16:25 2015 +0100
+++ b/jdk/test/com/sun/jdi/ClassesByName.java	Thu Jun 04 19:00:56 2015 +0100
@@ -26,7 +26,6 @@
  *  @bug 4287992
  *  @author Robert Field
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
--- a/jdk/test/com/sun/jdi/ExceptionEvents.java	Thu Jun 04 18:16:25 2015 +0100
+++ b/jdk/test/com/sun/jdi/ExceptionEvents.java	Thu Jun 04 19:00:56 2015 +0100
@@ -28,7 +28,6 @@
  *
  *  @author Robert Field
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build TestScaffold VMConnection
  *  @run compile -g ExceptionEvents.java
--- a/jdk/test/com/sun/jdi/FilterMatch.java	Thu Jun 04 18:16:25 2015 +0100
+++ b/jdk/test/com/sun/jdi/FilterMatch.java	Thu Jun 04 19:00:56 2015 +0100
@@ -28,7 +28,6 @@
  *
  *  @author Robert Field/Jim Holmlund
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
--- a/jdk/test/com/sun/jdi/FilterNoMatch.java	Thu Jun 04 18:16:25 2015 +0100
+++ b/jdk/test/com/sun/jdi/FilterNoMatch.java	Thu Jun 04 19:00:56 2015 +0100
@@ -28,7 +28,6 @@
  *
  *  @author Robert Field/Jim Holmlund
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
--- a/jdk/test/com/sun/jdi/LaunchCommandLine.java	Thu Jun 04 18:16:25 2015 +0100
+++ b/jdk/test/com/sun/jdi/LaunchCommandLine.java	Thu Jun 04 19:00:56 2015 +0100
@@ -27,7 +27,6 @@
  *  @summary Test launcher command line construction
  *  @author Gordon Hirsch
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g HelloWorld.java
--- a/jdk/test/com/sun/jdi/ModificationWatchpoints.java	Thu Jun 04 18:16:25 2015 +0100
+++ b/jdk/test/com/sun/jdi/ModificationWatchpoints.java	Thu Jun 04 19:00:56 2015 +0100
@@ -29,7 +29,6 @@
  *  @author Daniel Prusa (or someone in the FFJ group)
  *  @author Robert Field (modified to JDIScaffold)
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g ModificationWatchpoints.java
--- a/jdk/test/com/sun/jdi/NativeInstanceFilter.java	Thu Jun 04 18:16:25 2015 +0100
+++ b/jdk/test/com/sun/jdi/NativeInstanceFilter.java	Thu Jun 04 19:00:56 2015 +0100
@@ -28,7 +28,6 @@
  *
  *  @author Keith McGuigan
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @compile -XDignore.symbol.file NativeInstanceFilterTarg.java
--- a/jdk/test/com/sun/jdi/UnpreparedByName.java	Thu Jun 04 18:16:25 2015 +0100
+++ b/jdk/test/com/sun/jdi/UnpreparedByName.java	Thu Jun 04 19:00:56 2015 +0100
@@ -28,7 +28,6 @@
  *  won't be returned by classesByName.
  *  @author Robert Field
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g InnerTarg.java
--- a/jdk/test/com/sun/jdi/UnpreparedClasses.java	Thu Jun 04 18:16:25 2015 +0100
+++ b/jdk/test/com/sun/jdi/UnpreparedClasses.java	Thu Jun 04 19:00:56 2015 +0100
@@ -28,7 +28,6 @@
  *  loaded class list are prepared classes.
  *  @author Robert Field
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g InnerTarg.java
--- a/jdk/test/com/sun/jdi/Vars.java	Thu Jun 04 18:16:25 2015 +0100
+++ b/jdk/test/com/sun/jdi/Vars.java	Thu Jun 04 19:00:56 2015 +0100
@@ -27,7 +27,6 @@
  *
  *  @author Robert Field
  *
- *  @library scaffold
  *  @modules jdk.jdi
  *  @run build JDIScaffold VMConnection
  *  @run compile -g Vars.java