From 2d90d01d5d4073bae3e4996ea5e1c487a4c3f5bc Mon Sep 17 00:00:00 2001 From: DigitalSmile Date: Mon, 8 Jul 2024 10:15:32 +0300 Subject: [PATCH] #2 fixing tests --- .github/workflows/gradle.yml | 8 +++++--- .../github/digitalsmile/gpio/types/all/GPIOTypesAll.java | 2 +- .../main/java/io/github/digitalsmile/NativeProcessor.java | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 381cf04..6402524 100644 --- 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/annotation-processor-test/src/test/java/io/github/digitalsmile/gpio/types/all/GPIOTypesAll.java b/annotation-processor-test/src/test/java/io/github/digitalsmile/gpio/types/all/GPIOTypesAll.java index c2bc328..77adfd0 100644 --- a/annotation-processor-test/src/test/java/io/github/digitalsmile/gpio/types/all/GPIOTypesAll.java +++ b/annotation-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 index 0ce417f..61e0905 100644 --- 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 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;