提交 92f30fa3 编写于 作者: C Chuansheng Lu 提交者: Jonathan Lu

[MultiTenant] Fixed build failure on Windows

Summary: skip jgroup libraries on Windows

Test Plan: jdk/test/multi-tenant

Reviewed-by: kuaiwei, yuleil

Issue: https://github.com/alibaba/dragonwell8/issues/92
上级 dee38dc3
...@@ -87,7 +87,9 @@ include lib/Awt2dLibraries.gmk ...@@ -87,7 +87,9 @@ include lib/Awt2dLibraries.gmk
include lib/SoundLibraries.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 the corresponding custom file, if present.
-include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
/* /*
* @test * @test
* @requires os.family == "Linux"
* @requires os.arch == "amd64"
* @summary Test data structure integrity while access TenantContainer.tenantContainerMap concurrently * @summary Test data structure integrity while access TenantContainer.tenantContainerMap concurrently
* @library /lib/testlibrary * @library /lib/testlibrary
* @build TestGetAllTenantIDs * @build TestGetAllTenantIDs
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
# #
# @test TestJGroupDebugMode.sh # @test TestJGroupDebugMode.sh
# @requires os.family == "Linux"
# @requires os.arch == "amd64"
# @summary test debugging mode of JGroup native implementation # @summary test debugging mode of JGroup native implementation
# @run shell/timeout=300 TestJGroupDebugMode.sh # @run shell/timeout=300 TestJGroupDebugMode.sh
# #
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
import java.lang.reflect.Field; import java.lang.reflect.Field;
/* @test /* @test
* @requires os.family == "Linux"
* @requires os.arch == "amd64"
* @summary test scenario where JGroup will not be initialized * @summary test scenario where JGroup will not be initialized
* @compile TestNoJGroupInit.java * @compile TestNoJGroupInit.java
* @run main/othervm/timeout=300 -XX:+MultiTenant TestNoJGroupInit * @run main/othervm/timeout=300 -XX:+MultiTenant TestNoJGroupInit
......
/* /*
* @test * @test
* @requires os.family == "Linux"
* @requires os.arch == "amd64"
* @summary Test isolation of various static fields * @summary Test isolation of various static fields
* @library /lib/testlibrary * @library /lib/testlibrary
* @run main/othervm -XX:+UseG1GC -XX:+MultiTenant -XX:+TenantDataIsolation TestStaticFieldIsolation * @run main/othervm -XX:+UseG1GC -XX:+MultiTenant -XX:+TenantDataIsolation TestStaticFieldIsolation
......
...@@ -32,6 +32,8 @@ import static jdk.testlibrary.Asserts.*; ...@@ -32,6 +32,8 @@ import static jdk.testlibrary.Asserts.*;
/* /*
* @test * @test
* @requires os.family == "Linux"
* @requires os.arch == "amd64"
* @summary test.com.alibaba.tenant.TestCpuCfsThrottling * @summary test.com.alibaba.tenant.TestCpuCfsThrottling
* @library /lib/testlibrary * @library /lib/testlibrary
* @run main/othervm/bootclasspath -Xint -XX:+MultiTenant -XX:+TenantCpuThrottling -XX:+TenantCpuAccounting * @run main/othervm/bootclasspath -Xint -XX:+MultiTenant -XX:+TenantCpuThrottling -XX:+TenantCpuAccounting
......
...@@ -27,6 +27,8 @@ import static jdk.testlibrary.Asserts.*; ...@@ -27,6 +27,8 @@ import static jdk.testlibrary.Asserts.*;
/* /*
* @test * @test
* @requires os.family == "Linux"
* @requires os.arch == "amd64"
* @summary Test hierarchical tenants support * @summary Test hierarchical tenants support
* @library /lib/testlibrary * @library /lib/testlibrary
* @run main/othervm/bootclasspath -XX:+MultiTenant -XX:+TenantCpuThrottling -Xmx200m -Xms200m * @run main/othervm/bootclasspath -XX:+MultiTenant -XX:+TenantCpuThrottling -Xmx200m -Xms200m
......
...@@ -31,6 +31,8 @@ import static java.nio.file.StandardOpenOption.WRITE; ...@@ -31,6 +31,8 @@ import static java.nio.file.StandardOpenOption.WRITE;
/* /*
* @test * @test
* @requires os.family == "Linux"
* @requires os.arch == "amd64"
* @summary Test JGroup * @summary Test JGroup
* @library /lib/testlibrary * @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 * @run main/othervm/bootclasspath -XX:+MultiTenant -XX:+TenantCpuAccounting -XX:+TenantCpuThrottling -XX:+UseG1GC -Xmx200m -Xms200m -Dcom.alibaba.tenant.DebugJGroup=true com.alibaba.tenant.TestJGroup
......
...@@ -34,6 +34,8 @@ import static jdk.testlibrary.Asserts.*; ...@@ -34,6 +34,8 @@ import static jdk.testlibrary.Asserts.*;
/* /*
* @test * @test
* @requires os.family == "Linux"
* @requires os.arch == "amd64"
* @summary Test initialization code of JGroup * @summary Test initialization code of JGroup
* @library /lib/testlibrary * @library /lib/testlibrary
* @run main/othervm/bootclasspath -XX:+MultiTenant -XX:+TenantCpuThrottling -XX:+UseG1GC * @run main/othervm/bootclasspath -XX:+MultiTenant -XX:+TenantCpuThrottling -XX:+UseG1GC
......
...@@ -15,6 +15,8 @@ import com.alibaba.tenant.TenantContainer; ...@@ -15,6 +15,8 @@ import com.alibaba.tenant.TenantContainer;
import com.alibaba.tenant.TenantException; import com.alibaba.tenant.TenantException;
/* @test /* @test
* @requires os.family == "Linux"
* @requires os.arch == "amd64"
* @summary JMX related unit tests * @summary JMX related unit tests
* @library /lib/testlibrary * @library /lib/testlibrary
* @compile TestJMX.java * @compile TestJMX.java
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
package com.alibaba.tenant; package com.alibaba.tenant;
/* @test /* @test
* @requires os.family == "Linux"
* @requires os.arch == "amd64"
* @summary test TenantConfiguration facilities * @summary test TenantConfiguration facilities
* @library /lib/testlibrary * @library /lib/testlibrary
* @run main/othervm/bootclasspath -XX:+MultiTenant -XX:+UseG1GC -XX:+TenantCpuThrottling * @run main/othervm/bootclasspath -XX:+MultiTenant -XX:+UseG1GC -XX:+TenantCpuThrottling
......
...@@ -37,6 +37,8 @@ import java.util.concurrent.atomic.AtomicLong; ...@@ -37,6 +37,8 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.IntStream; import java.util.stream.IntStream;
/* @test /* @test
* @requires os.family == "Linux"
* @requires os.arch == "amd64"
* @summary unit tests for com.alibaba.tenant.TenantContainer * @summary unit tests for com.alibaba.tenant.TenantContainer
* @library /lib/testlibrary * @library /lib/testlibrary
* @compile TestTenantContainer.java * @compile TestTenantContainer.java
......
...@@ -32,6 +32,8 @@ import static jdk.testlibrary.Asserts.*; ...@@ -32,6 +32,8 @@ import static jdk.testlibrary.Asserts.*;
/* /*
* @test * @test
* @requires os.family == "Linux"
* @requires os.arch == "amd64"
* @library /lib/testlibrary * @library /lib/testlibrary
* @summary test RCM API based TenantContainerFactory * @summary test RCM API based TenantContainerFactory
* @run main/othervm/bootclasspath -XX:+MultiTenant com.alibaba.tenant.TestTenantContainerFactory * @run main/othervm/bootclasspath -XX:+MultiTenant com.alibaba.tenant.TestTenantContainerFactory
......
...@@ -28,6 +28,8 @@ import com.alibaba.tenant.TenantGlobals; ...@@ -28,6 +28,8 @@ import com.alibaba.tenant.TenantGlobals;
import static org.junit.Assert.*; import static org.junit.Assert.*;
/* @test /* @test
* @requires os.family == "Linux"
* @requires os.arch == "amd64"
* @summary unit tests for com.alibaba.tenant.TenantGlobals * @summary unit tests for com.alibaba.tenant.TenantGlobals
* @library /lib/testlibrary * @library /lib/testlibrary
* @compile TestTenantGlobals.java * @compile TestTenantGlobals.java
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册