--- a/jdk/test/tools/launcher/modules/patch/basic/PatchTest.java Wed Jun 07 10:58:58 2017 +0800
+++ b/jdk/test/tools/launcher/modules/patch/basic/PatchTest.java Tue Jun 06 19:54:08 2017 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -23,9 +23,10 @@
/**
* @test
- * @library /lib/testlibrary
+ * @library /lib/testlibrary /test/lib
* @modules jdk.compiler
- * @build PatchTest CompilerUtils JarUtils jdk.testlibrary.*
+ * @build PatchTest JarUtils jdk.testlibrary.*
+ * jdk.test.lib.compiler.CompilerUtils
* @run testng PatchTest
* @summary Basic test for --patch-module
*/
@@ -37,13 +38,13 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import jdk.test.lib.compiler.CompilerUtils;
import static jdk.testlibrary.ProcessTools.*;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
-
/**
* Compiles and launches a test that uses --patch-module with two directories
* of classes to override existing classes and add new classes to modules in