infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-28 03:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8360090: [TEST] RISC-V: disable some cds tests on qemu

Browse Source 
Reviewed-by: lmesnik, rehn
This commit is contained in:
Hamlin Li 2025-07-02 17:16:12 +00:00
parent c460f842bf
commit c50370599e
6 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/hotspot/jtreg/TEST.ROOT
View File

@ -79,6 +79,7 @@ requires.properties= \
vm.rtm.cpu \
vm.rtm.compiler \
vm.cds \
vm.cds.default.archive.available \
vm.cds.custom.loaders \
vm.cds.supports.aot.class.linking \
vm.cds.supports.aot.code.caching \

4
test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java
View File

@ -26,6 +26,7 @@
* @test id=nocoops_nocoh
* @summary Test Loading of default archives in all configurations
* @requires vm.cds
* @requires vm.cds.default.archive.available
* @requires vm.cds.write.archived.java.heap
* @requires vm.bits == 64
* @library /test/lib
@ -38,6 +39,7 @@
* @test id=nocoops_coh
* @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-coh)
* @requires vm.cds
* @requires vm.cds.default.archive.available
* @requires vm.cds.write.archived.java.heap
* @requires vm.bits == 64
* @library /test/lib
@ -50,6 +52,7 @@
* @test id=coops_nocoh
* @summary Test Loading of default archives in all configurations
* @requires vm.cds
* @requires vm.cds.default.archive.available
* @requires vm.cds.write.archived.java.heap
* @requires vm.bits == 64
* @library /test/lib
@ -62,6 +65,7 @@
* @test id=coops_coh
* @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-coh)
* @requires vm.cds
* @requires vm.cds.default.archive.available
* @requires vm.cds.write.archived.java.heap
* @requires vm.bits == 64
* @library /test/lib

3
test/hotspot/jtreg/runtime/cds/appcds/TestDumpClassListSource.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, 2025, 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
@ -28,6 +28,7 @@
* @summary test dynamic dump meanwhile output loaded class list
* @bug 8279009 8275084
* @requires vm.cds
* @requires vm.cds.default.archive.available
* @requires vm.cds.custom.loaders
* @requires vm.flagless
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds

3
test/hotspot/jtreg/runtime/cds/appcds/TransformInterfaceOfLambda.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2024, 2025, 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
@ -28,6 +28,7 @@
* @summary Transforming an interface of an archived lambda proxy class should not
* crash the VM. The lambda proxy class should be regenerated during runtime.
* @requires vm.cds
* @requires vm.cds.default.archive.available
* @requires vm.jvmti
* @requires vm.flagless
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes

1
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveNoDefaultArchive.java
View File

@ -27,6 +27,7 @@
* @summary Test -XX:+AutoCreateSharedArchive on a copied JDK without default shared archive
* @bug 8261455
* @requires vm.cds
* @requires vm.cds.default.archive.available
* @requires vm.flagless
* @comment This test doesn't work on Windows because it depends on symlinks
* @requires os.family != "windows"

11
test/jtreg-ext/requires/VMProps.java
View File

@ -120,6 +120,7 @@ public class VMProps implements Callable<Map<String, String>> {
map.put("vm.pageSize", this::vmPageSize);
// vm.cds is true if the VM is compiled with cds support.
map.put("vm.cds", this::vmCDS);
map.put("vm.cds.default.archive.available", this::vmCDSDefaultArchiveAvailable);
map.put("vm.cds.custom.loaders", this::vmCDSForCustomLoaders);
map.put("vm.cds.supports.aot.class.linking", this::vmCDSSupportsAOTClassLinking);
map.put("vm.cds.supports.aot.code.caching", this::vmCDSSupportsAOTCodeCaching);
@ -424,6 +425,16 @@ public class VMProps implements Callable<Map<String, String>> {
return "" + WB.isCDSIncluded();
}
/**
* Check for CDS default archive existence.
*
* @return true if CDS default archive classes.jsa exists in the JDK to be tested.
*/
protected String vmCDSDefaultArchiveAvailable() {
Path archive = Paths.get(System.getProperty("java.home"), "lib", "server", "classes.jsa");
return "" + ("true".equals(vmCDS()) && Files.exists(archive));
}
/**
* Check for CDS support for custom loaders.
*