#2 fixing tests

DigitalSmile · Jul 8, 2024 · 2d90d01 · 2d90d01
1 parent b5a541f
commit 2d90d01
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -28,11 +28,13 @@ jobs:
         with:
           java-version: '22'
           distribution: 'corretto'
-      - name: Install headers for test
-        run: sudo apt-get install -y linux-libc-dev
+      - name: Getting linux header version for tests
+        run: |
+          echo "headerVersion=$(uname -r)" >> "$GITHUB_ENV"
       - name: Change wrapper permissions
         run: chmod +x ./gradlew
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
       - name: Build Gradle
-        run: ./gradlew build
+        run: |
+          ./gradlew build :annotation-processor-test:build -DheaderVersion=$headerVersion
diff --git a/...tion-processor-test/src/test/java/io/github/digitalsmile/gpio/types/all/GPIOTypesAll.java b/...tion-processor-test/src/test/java/io/github/digitalsmile/gpio/types/all/GPIOTypesAll.java
@@ -6,7 +6,7 @@
 import io.github.digitalsmile.annotation.structure.Structs;
 import io.github.digitalsmile.annotation.structure.Unions;
 
-@NativeMemory(headers = "/usr/src/linux-headers-5.15.0-113/include/uapi/linux/gpio.h")
+@NativeMemory(headers = "/usr/src/linux-headers-${version}/include/uapi/linux/gpio.h")
 @NativeMemoryOptions(
         processRootConstants = true
 )

diff --git a/annotation-processor/src/main/java/io/github/digitalsmile/NativeProcessor.java b/annotation-processor/src/main/java/io/github/digitalsmile/NativeProcessor.java
@@ -263,6 +263,8 @@ private List<Path> getHeaderPaths(String[] headerFiles) {
         for (String headerFile : headerFiles) {
             Path headerPath;
             if (headerFile.startsWith("/")) {
+                headerFile = headerFile.replace("${version}", System.getProperty("headerVersion"));
+                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, headerFile);
                 headerPath = Path.of(headerFile);
             } else {
                 Path rootPath;