disable opc-tests on linux

apache · Jul 5, 2022 · aa12e1e · aa12e1e
1 parent 13a1860
commit aa12e1e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 17 deletions.
diff --git a/code-generation/language-java/pom.xml b/code-generation/language-java/pom.xml
@@ -84,6 +84,11 @@
       <artifactId>plc4x-code-generation-language-base-freemarker</artifactId>
       <version>0.10.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4x-code-generation-protocol-base-mspec</artifactId>
+      <version>0.10.0-SNAPSHOT</version>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.plc4x.plugins</groupId>
@@ -98,16 +103,9 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-text</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4x-code-generation-protocol-base-mspec</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.googlejavaformat</groupId>
       <artifactId>google-java-format</artifactId>
-      <version>1.15.0</version>
     </dependency>
 
     <!-- Make sure the dependencies of the module are built first -->

diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
@@ -48,10 +48,15 @@ public class OpcuaPlcDriverTest {
     @BeforeAll
     static void setUp() {
         assumeTrue(() -> {
-            String osArch= System.getProperty("os.arch");
-            // TODO: PLC4X-330 somehow opcua doesn't run properly on aarch64
-            return !"aarch64".equals(osArch);
-        }, "somehow opcua doesn't run properly on aarch64");
+            String OS = System.getProperty("os.name").toLowerCase();
+            if (OS.contains("nix")
+                || OS.contains("nux")
+                || OS.contains("aix")) {
+                return false;
+            }
+
+            return true;
+        }, "somehow opcua doesn't run properly on linux");
     }
 
     // Read only variables of milo example server of version 3.6

diff --git a/...opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java b/...opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java
@@ -32,7 +32,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.concurrent.TimeUnit;
 
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
@@ -41,10 +40,15 @@ public class OpcuaSubscriptionHandleTest {
     @BeforeAll
     static void setUp() {
         assumeTrue(() -> {
-            String osArch= System.getProperty("os.arch");
-            // TODO: PLC4X-330 somehow opcua doesn't run properly on aarch64
-            return !"aarch64".equals(osArch);
-        }, "somehow opcua doesn't run properly on aarch64");
+            String OS = System.getProperty("os.name").toLowerCase();
+            if (OS.contains("nix")
+                || OS.contains("nux")
+                || OS.contains("aix")) {
+                return false;
+            }
+
+            return true;
+        }, "somehow opcua doesn't run properly on linux");
     }
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OpcuaPlcDriverTest.class);

diff --git a/pom.xml b/pom.xml
@@ -293,6 +293,11 @@
         <artifactId>gson</artifactId>
         <version>${gson.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.google.googlejavaformat</groupId>
+        <artifactId>google-java-format</artifactId>
+        <version>1.15.0</version>
+      </dependency>
 
       <dependency>
         <groupId>org.awaitility</groupId>
@@ -722,8 +727,9 @@
 
             <!-- License Files for other licenses -->
             <exclude>**/UNLICENSE</exclude>
+            <exclude>**/EPL-2.0</exclude>
             <!--
-              Explicitly exclude these files as I was unable
+              Explicitly exclude thfese files as I was unable
               to add a new licenses to the configuration.
             -->
             <exclude>**/Expression.g4</exclude>