From 9b7067ddd27d348e02a66c184030f369bef20487 Mon Sep 17 00:00:00 2001 From: MohitMali Date: Fri, 3 Mar 2023 18:38:40 +0530 Subject: [PATCH] Fix path according to new folder structure --- lib/build.gradle | 2 +- lib/src/test/CMakeLists.txt | 4 ++-- lib/src/test/compile_and_run_test.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/build.gradle b/lib/build.gradle index 1479821..91b216b 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -267,7 +267,7 @@ task renameLibkiwixSoFile(type: Copy) { task copyBuildKiwixSoFile(type: Copy) { // copying linux_x86_64 so file - from projectDir.path + "/src/androidTests/java/org/kiwix/kiwixlib/libbuildkiwix.so" + from projectDir.path + "/src/test/libbuildkiwix.so" into buildDir.path } diff --git a/lib/src/test/CMakeLists.txt b/lib/src/test/CMakeLists.txt index 07c5937..4dc499e 100644 --- a/lib/src/test/CMakeLists.txt +++ b/lib/src/test/CMakeLists.txt @@ -35,8 +35,8 @@ if (JNI_FOUND) endif() include_directories( - /usr/lib/jvm/java-11-openjdk-amd64/include - /usr/lib/jvm/java-11-openjdk-amd64/include/linux +/opt/hostedtoolcache/jdk/11.0.17/x64/include +/opt/hostedtoolcache/jdk/11.0.17/x64/include/linux ${PROJECT_SOURCE_DIR}/../main/cpp ${PROJECT_SOURCE_DIR}/../../build/include/libkiwix ${PROJECT_SOURCE_DIR}/../../build/include/libzim diff --git a/lib/src/test/compile_and_run_test.sh b/lib/src/test/compile_and_run_test.sh index 267ec70..f11faa3 100755 --- a/lib/src/test/compile_and_run_test.sh +++ b/lib/src/test/compile_and_run_test.sh @@ -14,9 +14,9 @@ cmake . make # Copy generated .so file to build directory to run test cases -cd ../../../../../../../ +cd ../../../ ./gradlew copyBuildKiwixSoFile -cd app/src/androidTests/java/org/kiwix/kiwixlib/ +cd lib/src/test KIWIX_LIB_JAR=$1 if [ -z $KIWIX_LIB_JAR ]