diff --git a/make/CompileNativeLibraries.gmk b/make/CompileNativeLibraries.gmk index b7b477d730ffca432ac85bfbe8c1c88cb591a550..f314ba601eb5f3117423f5eb585c0ecd39ccc018 100644 --- a/make/CompileNativeLibraries.gmk +++ b/make/CompileNativeLibraries.gmk @@ -87,7 +87,9 @@ include lib/Awt2dLibraries.gmk include lib/SoundLibraries.gmk -include lib/JGroupLibraries.gmk +ifeq ($(OPENJDK_TARGET_OS), linux) + include lib/JGroupLibraries.gmk +endif # Include the corresponding custom file, if present. -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk diff --git a/test/multi-tenant/TestGetAllTenantIDs.java b/test/multi-tenant/TestGetAllTenantIDs.java index 9c976e62d877a3ba3bf2b2fe34928b44740ce420..366e4238b758369366253a1f39c805860bbb7b95 100644 --- a/test/multi-tenant/TestGetAllTenantIDs.java +++ b/test/multi-tenant/TestGetAllTenantIDs.java @@ -21,6 +21,8 @@ /* * @test + * @requires os.family == "Linux" + * @requires os.arch == "amd64" * @summary Test data structure integrity while access TenantContainer.tenantContainerMap concurrently * @library /lib/testlibrary * @build TestGetAllTenantIDs diff --git a/test/multi-tenant/TestJGroupDebugMode.sh b/test/multi-tenant/TestJGroupDebugMode.sh index 763f2a20de91cd25d4dd28caabbce540cf11873f..1f55652bf88f5f05e7bc082b0f378dd7bd2731e8 100644 --- a/test/multi-tenant/TestJGroupDebugMode.sh +++ b/test/multi-tenant/TestJGroupDebugMode.sh @@ -23,6 +23,8 @@ # # @test TestJGroupDebugMode.sh +# @requires os.family == "Linux" +# @requires os.arch == "amd64" # @summary test debugging mode of JGroup native implementation # @run shell/timeout=300 TestJGroupDebugMode.sh # diff --git a/test/multi-tenant/TestNoJGroupInit.java b/test/multi-tenant/TestNoJGroupInit.java index 334b300dde4a9c2ca64733885ee4391fef983b7b..5ca3727e04a42aac023787038882650fb6b0cc6d 100644 --- a/test/multi-tenant/TestNoJGroupInit.java +++ b/test/multi-tenant/TestNoJGroupInit.java @@ -21,6 +21,8 @@ import java.lang.reflect.Field; /* @test + * @requires os.family == "Linux" + * @requires os.arch == "amd64" * @summary test scenario where JGroup will not be initialized * @compile TestNoJGroupInit.java * @run main/othervm/timeout=300 -XX:+MultiTenant TestNoJGroupInit diff --git a/test/multi-tenant/TestStaticFieldIsolation.java b/test/multi-tenant/TestStaticFieldIsolation.java index d8f3c3de291d5a8525c40cf10bf74ce36aa72fd0..e1e868dde6607351b6b4f97d1845d300c345c26b 100644 --- a/test/multi-tenant/TestStaticFieldIsolation.java +++ b/test/multi-tenant/TestStaticFieldIsolation.java @@ -1,6 +1,8 @@ /* * @test + * @requires os.family == "Linux" + * @requires os.arch == "amd64" * @summary Test isolation of various static fields * @library /lib/testlibrary * @run main/othervm -XX:+UseG1GC -XX:+MultiTenant -XX:+TenantDataIsolation TestStaticFieldIsolation diff --git a/test/multi-tenant/test/com/alibaba/tenant/TestCpuCfsThrottling.java b/test/multi-tenant/test/com/alibaba/tenant/TestCpuCfsThrottling.java index 77bda0e75f1895d48f183c2df98f0f87cba8a35a..56bdbf0ad8a660a2790170e7e528a43847deeabb 100644 --- a/test/multi-tenant/test/com/alibaba/tenant/TestCpuCfsThrottling.java +++ b/test/multi-tenant/test/com/alibaba/tenant/TestCpuCfsThrottling.java @@ -32,6 +32,8 @@ import static jdk.testlibrary.Asserts.*; /* * @test + * @requires os.family == "Linux" + * @requires os.arch == "amd64" * @summary test.com.alibaba.tenant.TestCpuCfsThrottling * @library /lib/testlibrary * @run main/othervm/bootclasspath -Xint -XX:+MultiTenant -XX:+TenantCpuThrottling -XX:+TenantCpuAccounting diff --git a/test/multi-tenant/test/com/alibaba/tenant/TestHierachicalTenants.java b/test/multi-tenant/test/com/alibaba/tenant/TestHierachicalTenants.java index 104a046b4207b70f68997fbb25c5af525bcc6f10..c049f07378531fd8ec02d6771946725de2044e8f 100644 --- a/test/multi-tenant/test/com/alibaba/tenant/TestHierachicalTenants.java +++ b/test/multi-tenant/test/com/alibaba/tenant/TestHierachicalTenants.java @@ -27,6 +27,8 @@ import static jdk.testlibrary.Asserts.*; /* * @test + * @requires os.family == "Linux" + * @requires os.arch == "amd64" * @summary Test hierarchical tenants support * @library /lib/testlibrary * @run main/othervm/bootclasspath -XX:+MultiTenant -XX:+TenantCpuThrottling -Xmx200m -Xms200m diff --git a/test/multi-tenant/test/com/alibaba/tenant/TestJGroup.java b/test/multi-tenant/test/com/alibaba/tenant/TestJGroup.java index d153f85ea4fd57e80f9686fb5b423de5fb25e514..4d58eb0c6d869d163e5eac2abccc31f04c9d4126 100644 --- a/test/multi-tenant/test/com/alibaba/tenant/TestJGroup.java +++ b/test/multi-tenant/test/com/alibaba/tenant/TestJGroup.java @@ -31,6 +31,8 @@ import static java.nio.file.StandardOpenOption.WRITE; /* * @test + * @requires os.family == "Linux" + * @requires os.arch == "amd64" * @summary Test JGroup * @library /lib/testlibrary * @run main/othervm/bootclasspath -XX:+MultiTenant -XX:+TenantCpuAccounting -XX:+TenantCpuThrottling -XX:+UseG1GC -Xmx200m -Xms200m -Dcom.alibaba.tenant.DebugJGroup=true com.alibaba.tenant.TestJGroup diff --git a/test/multi-tenant/test/com/alibaba/tenant/TestJGroupInit.java b/test/multi-tenant/test/com/alibaba/tenant/TestJGroupInit.java index d9210791bdba32ba44dd9f2ca0da713816104390..77b7a6060beb2ebc84ede1d8cf0e49f263288c4a 100644 --- a/test/multi-tenant/test/com/alibaba/tenant/TestJGroupInit.java +++ b/test/multi-tenant/test/com/alibaba/tenant/TestJGroupInit.java @@ -34,6 +34,8 @@ import static jdk.testlibrary.Asserts.*; /* * @test + * @requires os.family == "Linux" + * @requires os.arch == "amd64" * @summary Test initialization code of JGroup * @library /lib/testlibrary * @run main/othervm/bootclasspath -XX:+MultiTenant -XX:+TenantCpuThrottling -XX:+UseG1GC diff --git a/test/multi-tenant/test/com/alibaba/tenant/TestJMX.java b/test/multi-tenant/test/com/alibaba/tenant/TestJMX.java index 6b49bf6b803b7fba23f8e0e70fc0524765c341aa..0e4b399a3b96ffff7d87de71b49f43a27c1e77dc 100644 --- a/test/multi-tenant/test/com/alibaba/tenant/TestJMX.java +++ b/test/multi-tenant/test/com/alibaba/tenant/TestJMX.java @@ -15,6 +15,8 @@ import com.alibaba.tenant.TenantContainer; import com.alibaba.tenant.TenantException; /* @test + * @requires os.family == "Linux" + * @requires os.arch == "amd64" * @summary JMX related unit tests * @library /lib/testlibrary * @compile TestJMX.java diff --git a/test/multi-tenant/test/com/alibaba/tenant/TestTenantConfiguration.java b/test/multi-tenant/test/com/alibaba/tenant/TestTenantConfiguration.java index 668e53bdfd52105502b46fb5bb7a3df3ce1039e6..ac3fad09e908744111f1995ae3d476fad89903a3 100644 --- a/test/multi-tenant/test/com/alibaba/tenant/TestTenantConfiguration.java +++ b/test/multi-tenant/test/com/alibaba/tenant/TestTenantConfiguration.java @@ -21,6 +21,8 @@ package com.alibaba.tenant; /* @test + * @requires os.family == "Linux" + * @requires os.arch == "amd64" * @summary test TenantConfiguration facilities * @library /lib/testlibrary * @run main/othervm/bootclasspath -XX:+MultiTenant -XX:+UseG1GC -XX:+TenantCpuThrottling diff --git a/test/multi-tenant/test/com/alibaba/tenant/TestTenantContainer.java b/test/multi-tenant/test/com/alibaba/tenant/TestTenantContainer.java index 76439e28179cf097867fc803aae53f9332ba3434..f270f6ef85f868f238503597a53d4366bc29c1ae 100644 --- a/test/multi-tenant/test/com/alibaba/tenant/TestTenantContainer.java +++ b/test/multi-tenant/test/com/alibaba/tenant/TestTenantContainer.java @@ -37,6 +37,8 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.stream.IntStream; /* @test + * @requires os.family == "Linux" + * @requires os.arch == "amd64" * @summary unit tests for com.alibaba.tenant.TenantContainer * @library /lib/testlibrary * @compile TestTenantContainer.java diff --git a/test/multi-tenant/test/com/alibaba/tenant/TestTenantContainerFactory.java b/test/multi-tenant/test/com/alibaba/tenant/TestTenantContainerFactory.java index a9b86adcedf93c624d357ad989616100fd97e8d3..2c5b38b024f74d1b4fb6448ef912de76623713e8 100644 --- a/test/multi-tenant/test/com/alibaba/tenant/TestTenantContainerFactory.java +++ b/test/multi-tenant/test/com/alibaba/tenant/TestTenantContainerFactory.java @@ -32,6 +32,8 @@ import static jdk.testlibrary.Asserts.*; /* * @test + * @requires os.family == "Linux" + * @requires os.arch == "amd64" * @library /lib/testlibrary * @summary test RCM API based TenantContainerFactory * @run main/othervm/bootclasspath -XX:+MultiTenant com.alibaba.tenant.TestTenantContainerFactory diff --git a/test/multi-tenant/test/com/alibaba/tenant/TestTenantGlobals.java b/test/multi-tenant/test/com/alibaba/tenant/TestTenantGlobals.java index 912e6006fab550daa9366a1afec169b92c47625e..e25fdc8685999cf452550048fbbeb02ec5e9af20 100644 --- a/test/multi-tenant/test/com/alibaba/tenant/TestTenantGlobals.java +++ b/test/multi-tenant/test/com/alibaba/tenant/TestTenantGlobals.java @@ -28,6 +28,8 @@ import com.alibaba.tenant.TenantGlobals; import static org.junit.Assert.*; /* @test + * @requires os.family == "Linux" + * @requires os.arch == "amd64" * @summary unit tests for com.alibaba.tenant.TenantGlobals * @library /lib/testlibrary * @compile TestTenantGlobals.java