Fix CPU test to allow multiple valid CPU types

Also fix CI so that if the macos tests run on aarch64, it still works.
smallrye · Apr 30, 2024 · eae407f · eae407f
1 parent e03a56a
commit eae407f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -48,7 +48,7 @@ jobs:
       - name: build with maven
         run: |
           mvn -q -N "io.takari:maven:${{env.IO_TAKARI_MAVEN_WRAPPER_VERSION}}:wrapper" "-Dmaven=${{env.MAVEN_VERSION}}"
-          ./mvnw -B -ntp formatter:validate verify --file pom.xml "-Dexpected-cpu=x64" "-Djava11.home=${{env.JAVA_HOME_11_X64}}"
+          ./mvnw -B -ntp formatter:validate verify --file pom.xml "-Dexpected-cpu=x64,aarch64" "-Djava11.home=${{env.JAVA_HOME_11_X64}}${{env.JAVA_HOME_11_ARM64}}" "-Djava17.home=${{env.JAVA_HOME_17_X64}}${{env.JAVA_HOME_17_ARM64}}"
 
   quality:
     needs: [ build ]

diff --git a/cpu/src/test/java/io/smallrye/common/cpu/CPUTests.java b/cpu/src/test/java/io/smallrye/common/cpu/CPUTests.java
@@ -1,5 +1,7 @@
 package io.smallrye.common.cpu;
 
+import java.util.Set;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
@@ -13,6 +15,7 @@ public final class CPUTests {
     public void testCpu() {
         String expectedCpuName = System.getProperty("expected-cpu");
         Assumptions.assumeTrue(expectedCpuName != null && !expectedCpuName.isEmpty());
-        Assertions.assertEquals(CPU.host().name(), expectedCpuName);
+        Set<String> allowedCpus = Set.of(expectedCpuName.split(","));
+        Assertions.assertTrue(allowedCpus.contains(CPU.host().name()));
     }
 }