Include correct dependencies for testsuite-shading on windows. (#8491)
Motivation: We missed to include a profile for windows which means that we did not have the correct dependencies setup. Modifications: - Add missing profile - Add assumeFalse(...) to ensure we do only test the native transpot shading on non windows platforms. - Explicit specify dependency on netty-common Result: Fixes https://github.com/netty/netty/issues/8489.
This commit is contained in:
parent
c0dfb568a2
commit
88e4817cef
@ -65,6 +65,35 @@
|
|||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<profiles>
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>windows</id>
|
||||||
|
<activation>
|
||||||
|
<os>
|
||||||
|
<family>windows</family>
|
||||||
|
</os>
|
||||||
|
</activation>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>netty-common</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>netty-handler</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>${tcnative.artifactId}</artifactId>
|
||||||
|
<version>${tcnative.version}</version>
|
||||||
|
<classifier>${tcnative.classifier}</classifier>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</profile>
|
||||||
<profile>
|
<profile>
|
||||||
<id>mac</id>
|
<id>mac</id>
|
||||||
<activation>
|
<activation>
|
||||||
@ -76,6 +105,12 @@
|
|||||||
<nativeTransportLib>netty_transport_native_kqueue_${os.detected.arch}.jnilib</nativeTransportLib>
|
<nativeTransportLib>netty_transport_native_kqueue_${os.detected.arch}.jnilib</nativeTransportLib>
|
||||||
</properties>
|
</properties>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>netty-common</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>netty-transport-native-kqueue</artifactId>
|
<artifactId>netty-transport-native-kqueue</artifactId>
|
||||||
@ -214,6 +249,12 @@
|
|||||||
<nativeTransportLib>netty_transport_native_epoll_${os.detected.arch}.so</nativeTransportLib>
|
<nativeTransportLib>netty_transport_native_epoll_${os.detected.arch}.so</nativeTransportLib>
|
||||||
</properties>
|
</properties>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${project.groupId}</groupId>
|
||||||
|
<artifactId>netty-common</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>netty-transport-native-epoll</artifactId>
|
<artifactId>netty-transport-native-epoll</artifactId>
|
||||||
|
@ -17,6 +17,7 @@ package io.netty.testsuite.shading;
|
|||||||
|
|
||||||
import io.netty.util.internal.PlatformDependent;
|
import io.netty.util.internal.PlatformDependent;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
import org.junit.Assume;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
|
||||||
@ -27,6 +28,9 @@ public class ShadingIT {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testShadingNativeTransport() throws Exception {
|
public void testShadingNativeTransport() throws Exception {
|
||||||
|
// Skip on windows.
|
||||||
|
Assume.assumeFalse(PlatformDependent.isWindows());
|
||||||
|
|
||||||
String className = PlatformDependent.isOsx() ?
|
String className = PlatformDependent.isOsx() ?
|
||||||
"io.netty.channel.kqueue.KQueue" : "io.netty.channel.epoll.Epoll";
|
"io.netty.channel.kqueue.KQueue" : "io.netty.channel.epoll.Epoll";
|
||||||
testShading0(SHADING_PREFIX, className);
|
testShading0(SHADING_PREFIX, className);
|
||||||
@ -35,6 +39,9 @@ public class ShadingIT {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testShadingTcnative() throws Exception {
|
public void testShadingTcnative() throws Exception {
|
||||||
|
// Skip on windows.
|
||||||
|
Assume.assumeFalse(PlatformDependent.isWindows());
|
||||||
|
|
||||||
String className = "io.netty.handler.ssl.OpenSsl";
|
String className = "io.netty.handler.ssl.OpenSsl";
|
||||||
testShading0(SHADING_PREFIX, className);
|
testShading0(SHADING_PREFIX, className);
|
||||||
testShading0(SHADING_PREFIX2, className);
|
testShading0(SHADING_PREFIX2, className);
|
||||||
|
Loading…
Reference in New Issue
Block a user