Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More fixes to allow project to build on Windows 10

This commit is contained in:
Joakim Erdfelt 2020-10-16 16:45:25 -05:00
parent 07d35d32ae
commit e6fb4c3ac4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-http2/http2-server/pom.xml
View File

@ -87,9 +87,11 @@
</build> </build>
</profile> </profile>
<profile> <profile>
<id>run-docker-http2spec</id> <id>run-h2spec-in-docker</id>
<activation> <activation>
<file>/var/run/docker.sock</file> <file>
<exists>/var/run/docker.sock</exists>
</file>
</activation> </activation>
<build> <build>
<plugins> <plugins>

3
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java
View File

@ -36,7 +36,9 @@ import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnJre; import org.junit.jupiter.api.condition.DisabledOnJre;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.api.condition.OS;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
@ -204,6 +206,7 @@ public class DistributionTests extends AbstractDistributionTest
} }
@Test @Test
@DisabledOnOs(OS.WINDOWS) // jnr not supported on windows
public void testUnixSocket() throws Exception public void testUnixSocket() throws Exception
{ {
Path tmpSockFile; Path tmpSockFile;