--- a/test/jdk/tools/jimage/JImageTest.java Tue Oct 02 21:38:54 2018 +0530
+++ b/test/jdk/tools/jimage/JImageTest.java Tue Oct 02 22:36:08 2018 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -93,9 +93,9 @@
}
File jdkHome = new File(System.getProperty("test.jdk"));
- // JPRT not yet ready for jmods
Helper helper = Helper.newHelper();
if (helper == null) {
+ // Skip test if the jmods directory is missing (e.g. exploded image)
System.err.println("Test not run, NO jmods directory");
return;
}