changeset 34480:124ac002c969

8143268: Langtools tools should create output directories as needed. Reviewed-by: jlahoda
author jjg
date Fri, 04 Dec 2015 14:22:04 -0800
parents 2a1f2bb7cc13
children e0ff9821f1e8
files langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties langtools/test/tools/javac/T6413876.java langtools/test/tools/javac/file/T8143268.java langtools/test/tools/javac/options/modes/OutputDirTest.java
diffstat 5 files changed, 73 insertions(+), 59 deletions(-) [+]
line wrap: on
line diff
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java	Fri Dec 04 09:46:12 2015 -0800
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java	Fri Dec 04 14:22:04 2015 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -417,6 +417,9 @@
         if (!checkDirectory(Option.S)) {
             return false;
         }
+        if (!checkDirectory(Option.H)) {
+            return false;
+        }
 
         String sourceString = options.get(Option.SOURCE);
         Source source = (sourceString != null)
@@ -580,11 +583,7 @@
             return true;
         }
         File file = new File(value);
-        if (!file.exists()) {
-            error("err.dir.not.found", value);
-            return false;
-        }
-        if (!file.isDirectory()) {
+        if (file.exists() && !file.isDirectory()) {
             error("err.file.not.directory", value);
             return false;
         }
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties	Fri Dec 04 09:46:12 2015 -0800
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties	Fri Dec 04 14:22:04 2015 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2015, 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
@@ -296,8 +296,6 @@
     target release {0} conflicts with default source release {1}
 javac.warn.profile.target.conflict=\
     profile {0} is not valid for target release {1}
-javac.err.dir.not.found=\
-    directory not found: {0}
 javac.err.file.not.found=\
     file not found: {0}
 javac.err.file.not.directory=\
--- a/langtools/test/tools/javac/T6413876.java	Fri Dec 04 09:46:12 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2006, 2015, 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.
- */
-
-/*
- * @test
- * @bug 6413876
- * @summary REGRESSION javac -d /directory/ creates destination directories
- * @modules java.compiler
- *          jdk.compiler
- */
-
-import java.io.*;
-import javax.tools.*;
-
-public class T6413876 {
-    public static void main(String... args) {
-        test("-d");
-        test("-s");
-    }
-
-    private static void test(String outOpt) {
-        File testSrc = new File(System.getProperty("test.src", "."));
-        File file = new File(testSrc, T6413876.class.getName()+".java");
-        Tool t = ToolProvider.getSystemJavaCompiler();
-        int rc = t.run(null, null, null, outOpt, "NotADir", file.getPath());
-        if (rc == 0)
-            throw new AssertionError("compilation succeeded unexpectedly");
-    }
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/file/T8143268.java	Fri Dec 04 14:22:04 2015 -0800
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+/**
+ * @test
+ * @bug 8143268
+ * @summary javac should create output directories as needed
+ * @modules jdk.compiler
+ */
+
+import java.io.*;
+
+public class T8143268 {
+    public static void main(String... args) throws Exception{
+        new T8143268().run();
+    }
+
+    void run() throws IOException {
+        File src = new File("src");
+        src.mkdirs();
+        try (FileWriter out = new FileWriter(new File(src, "Test.java"))) {
+            out.write("public class Test { native void m(); }");
+        }
+
+        javac("-d", "classes", "-h", "hdr", "src/Test.java");
+
+        check("classes/Test.class");
+        check("hdr/Test.h");
+    }
+
+    void javac(String... args) {
+        try (PrintWriter pw = new PrintWriter(new OutputStreamWriter(System.out))) {
+            int rc = com.sun.tools.javac.Main.compile(args, pw);
+            if (rc != 0) {
+                throw new Error("compilation failed: " + rc);
+            }
+        }
+    }
+
+    void check(String path) {
+        if (!new File(path).exists()) {
+            throw new Error("file not found: " + path);
+        }
+    }
+}
+
--- a/langtools/test/tools/javac/options/modes/OutputDirTest.java	Fri Dec 04 09:46:12 2015 -0800
+++ b/langtools/test/tools/javac/options/modes/OutputDirTest.java	Fri Dec 04 14:22:04 2015 -0800
@@ -58,7 +58,7 @@
         String[] files = { "src/C.java" };
 
         runMain(opts, files)
-                .checkResult(Main.Result.CMDERR.exitCode);
+                .checkResult(Main.Result.OK.exitCode);
 
 // The API tests are disabled (for now) because Args.validate does
 // not have an easy way to access/validate file manager options,