test/jdk/tools/jimage/JImageTest.java
changeset 51994 7577686cc9bd
parent 47216 71c04702a3d5
equal deleted inserted replaced
51993:c0d05cf1d19d 51994:7577686cc9bd
     1 /*
     1 /*
     2  * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
     2  * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4  *
     4  *
     5  * This code is free software; you can redistribute it and/or modify it
     5  * This code is free software; you can redistribute it and/or modify it
     6  * under the terms of the GNU General Public License version 2 only, as
     6  * under the terms of the GNU General Public License version 2 only, as
     7  * published by the Free Software Foundation.
     7  * published by the Free Software Foundation.
    91         if (bootClasses.isEmpty()) {
    91         if (bootClasses.isEmpty()) {
    92             throw new RuntimeException("No boot class to check against");
    92             throw new RuntimeException("No boot class to check against");
    93         }
    93         }
    94 
    94 
    95         File jdkHome = new File(System.getProperty("test.jdk"));
    95         File jdkHome = new File(System.getProperty("test.jdk"));
    96         // JPRT not yet ready for jmods
       
    97         Helper helper = Helper.newHelper();
    96         Helper helper = Helper.newHelper();
    98         if (helper == null) {
    97         if (helper == null) {
       
    98             // Skip test if the jmods directory is missing (e.g. exploded image)
    99             System.err.println("Test not run, NO jmods directory");
    99             System.err.println("Test not run, NO jmods directory");
   100             return;
   100             return;
   101         }
   101         }
   102 
   102 
   103         // Generate the sample image
   103         // Generate the sample image