--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileAbsoluteDirectoryTest.java	Wed Mar 13 12:30:20 2019 -0700
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2019, 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
+ * @requires vm.aot
+ * @library / /test/lib /testlibrary
+ * @modules java.base/jdk.internal.misc
+ * @build compiler.aot.cli.jaotc.CompileAbsoluteDirectoryTest
+ * @run driver ClassFileInstaller compiler.aot.cli.jaotc.data.HelloWorldOne
+ *                                compiler.aot.cli.jaotc.data.HelloWorldTwo
+ * @run driver compiler.aot.cli.jaotc.CompileAbsoluteDirectoryTest
+ * @summary check jaotc can compile directory with classes where directory is specified by absolute path
+ * @bug 8218859
+ */
+package compiler.aot.cli.jaotc;
+
+import compiler.aot.cli.jaotc.data.HelloWorldOne;
+import compiler.aot.cli.jaotc.data.HelloWorldTwo;
+import java.io.File;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class CompileAbsoluteDirectoryTest {
+    public static void main(String[] args) {
+        try {
+            String dir = new java.io.File(".").getAbsolutePath();
+            System.out.println("Do test --directory " + dir);
+            OutputAnalyzer oa = JaotcTestHelper.compileLibrary("--directory", dir);
+            oa.shouldHaveExitValue(0);
+            File compiledLibrary = new File(JaotcTestHelper.DEFAULT_LIB_PATH);
+            Asserts.assertTrue(compiledLibrary.exists(), "Compiled library file missing");
+            Asserts.assertGT(compiledLibrary.length(), 0L, "Unexpected compiled library size");
+            JaotcTestHelper.checkLibraryUsage(HelloWorldOne.class.getName());
+            JaotcTestHelper.checkLibraryUsage(HelloWorldTwo.class.getName());
+        } catch (Exception e) {
+            throw new Error("Can't get full path name for '.', got exception " + e, e);
+        }
+    }
+}

--- a/test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileDirectoryTest.java	Wed Mar 13 18:43:16 2019 +0000
+++ b/test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileDirectoryTest.java	Wed Mar 13 12:30:20 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -30,7 +30,7 @@
  * @run driver ClassFileInstaller compiler.aot.cli.jaotc.data.HelloWorldOne
  *                                compiler.aot.cli.jaotc.data.HelloWorldTwo
  * @run driver compiler.aot.cli.jaotc.CompileDirectoryTest
- * @summary check jaotc can compile directory with classes
+ * @summary check jaotc can compile directory with classes where directory is specified by relative path
  */
 package compiler.aot.cli.jaotc;