29
29
30
30
import tests .Helper ;
31
31
32
+ import jtreg .SkippedException ;
33
+
32
34
/* @test
33
35
* @bug 8264322
34
36
* @summary Test the --generate-cds-archive plugin
@@ -49,6 +51,9 @@ public class CDSPluginTest {
49
51
50
52
public static void main (String [] args ) throws Throwable {
51
53
54
+ if (!Platform .isDefaultCDSArchiveSupported ())
55
+ throw new SkippedException ("not a supported platform" );
56
+
52
57
Helper helper = Helper .newHelper ();
53
58
if (helper == null ) {
54
59
System .err .println ("Test not run" );
@@ -69,8 +74,14 @@ public static void main(String[] args) throws Throwable {
69
74
subDir = "lib" + sep ;
70
75
}
71
76
subDir += "server" + sep ;
72
- helper .checkImage (image , module , null , null ,
73
- new String [] { subDir + "classes.jsa" , subDir + "classes_nocoops.jsa" });
77
+
78
+ if (Platform .isAArch64 () || Platform .isX64 ()) {
79
+ helper .checkImage (image , module , null , null ,
80
+ new String [] { subDir + "classes.jsa" , subDir + "classes_nocoops.jsa" });
81
+ } else {
82
+ helper .checkImage (image , module , null , null ,
83
+ new String [] { subDir + "classes.jsa" });
84
+ }
74
85
75
86
// Simulate different platforms between current runtime and target image.
76
87
if (Platform .isLinux ()) {
0 commit comments