More fixes to allow project to build on Windows 10

jetty · Oct 16, 2020 · e6fb4c3 · e6fb4c3
1 parent 07d35d3
commit e6fb4c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml
@@ -87,9 +87,11 @@
       </build>
     </profile>
     <profile>
-      <id>run-docker-http2spec</id>
+      <id>run-h2spec-in-docker</id>
       <activation>
-        <file>/var/run/docker.sock</file>
+        <file>
+          <exists>/var/run/docker.sock</exists>
+        </file>
       </activation>
       <build>
         <plugins>

diff --git a/...st-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/...st-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java
@@ -36,7 +36,9 @@
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.junit.jupiter.api.Test;
 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.OS;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
@@ -204,6 +206,7 @@ private void testSimpleWebAppWithJSPOverHTTP2(boolean ssl) throws Exception
     }
 
     @Test
+    @DisabledOnOs(OS.WINDOWS)  // jnr not supported on windows
     public void testUnixSocket() throws Exception
     {
         Path tmpSockFile;