Fix tests on Linux (#1)

* CI: Fix env var name
* Improve exception when unable to read env/file
* Don't append architecture for darwin natives
* Use a `zstd.lib` property to load the shared library using JNA

Author: freya022

.github/workflows/test.yml

@@ -2,8 +2,6 @@ name: Test discord-zstd-java
 on:
   pull_request:
   push:
-    branches:
-      - master
 
 env:
   COMMON_CMAKE_FLAGS: "-DZSTD_BUILD_PROGRAMS=OFF -DZSTD_LEGACY_SUPPORT=OFF -DZSTD_BUILD_STATIC=OFF -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_DICTBUILDER=OFF -DZSTD_BUILD_COMPRESSION=OFF -DCMAKE_BUILD_TYPE=Debug"
@@ -31,7 +29,6 @@ jobs:
           cmake --build . -j 4
           cp lib/libzstd.so ../../../output/x64/libzstd.so
           cd ..
-          
 
       - name: Publish Artifacts
         uses: actions/upload-artifact@v5
@@ -74,7 +71,7 @@ jobs:
       - name: Run tests
         env:
           TEST_DATA_ZSTD_KEY: ${{ secrets.TEST_DATA_ZSTD_KEY }}
-          TEST_DATA_ZSTD_PARAMS: ${{ secrets.TEST_DATA_ZSTD_PARAMS }}
+          TEST_DATA_ZSTD_PARAMETERS: ${{ secrets.TEST_DATA_ZSTD_PARAMETERS }}
         run: ./gradlew test
 
       - name: Upload JUnit XML Test Report
@@ -92,7 +89,7 @@ jobs:
           path: '**/build/reports/tests/test'
 
       - name: Annotate Failed Tests
-        uses: mikepenz/action-junit-report@v6
+        uses: mikepenz/action-junit-report@v6.0.0
         if: ${{ !cancelled() }}
         with:
           report_paths: '**/build/test-results/test/TEST-*.xml'

api/src/main/java/dev/freya02/discord/zstd/api/ZstdNativesLoader.java

@@ -17,7 +17,9 @@ public static synchronized boolean load(Path path) {
         if (init)
             return false;
 
-        System.load(path.toAbsolutePath().toString());
+        final String pathStr = path.toAbsolutePath().toString();
+        System.setProperty("zstd.lib", pathStr);
+        System.load(pathStr);
         init = true;
         return true;
     }
@@ -32,19 +34,19 @@ public static synchronized boolean loadFromJar() throws IOException {
         String platform;
         String extension;
         if (osName.startsWith("Linux")) {
-            platform = "linux";
+            platform = "linux-" + architecture;
             extension = "so";
         } else if (osName.startsWith("Mac") || osName.startsWith("Darwin")) {
             platform = "darwin";
             extension = "dylib";
         } else if (osName.startsWith("Windows")) {
-            platform = "win32";
+            platform = "win32-" + architecture;
             extension = "dll";
         } else {
             throw new UnsupportedOperationException("Unsupported OS: " + osName);
         }
 
-        String resourcePath = String.format("/natives/%s-%s/libzstd.%s", platform, architecture, extension);
+        String resourcePath = String.format("/natives/%s/libzstd.%s", platform, extension);
         Path nativePath = NativeUtil.copyNativeFromJar(resourcePath);
         load(nativePath);
         return true;

jna-impl/src/main/java/dev/freya02/discord/zstd/jna/ZstdJna.java

@@ -1,15 +1,14 @@
 package dev.freya02.discord.zstd.jna;
 
 import com.sun.jna.Library;
-import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
 
 import java.nio.ByteBuffer;
 
 public interface ZstdJna extends Library
 {
-    ZstdJna INSTANCE = Native.load(null, ZstdJna.class);
+    ZstdJna INSTANCE = ZstdJnaHelper.load();
 
     Pointer ZSTD_createDStream();
 

jna-impl/src/main/java/dev/freya02/discord/zstd/jna/ZstdJnaHelper.java

@@ -0,0 +1,17 @@
+package dev.freya02.discord.zstd.jna;
+
+import com.sun.jna.Native;
+import com.sun.jna.Platform;
+
+public class ZstdJnaHelper {
+    public static ZstdJna load() {
+        String lib = System.getProperty("zstd.lib");
+        // On Windows and macOS, if lib is null, it will link functions from the current process,
+        // on Linux, `System.load` does not allow JNA to find the functions, see https://github.com/java-native-access/jna/issues/1698
+        if (lib == null && Platform.isLinux()) {
+            throw new IllegalStateException("Cannot load Zstd from the current process on Linux systems, 'zstd.lib' must be set before ZstdJna is used");
+        }
+
+        return Native.load(lib, ZstdJna.class);
+    }
+}

test-data/src/main/java/dev/freya02/discord/zstd/TestChunks.java

@@ -96,7 +96,11 @@ private static String readEnvOrFile(String varName, Path path) throws IOExceptio
         final String envVar = System.getenv(varName);
         if (envVar != null) return envVar;
 
-        return new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
+        try {
+            return new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            throw new IOException("Env var '" + varName + "' is not present", e);
+        }
     }
 
     private static boolean isCompressedChunk(Path path) {