summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2022-10-07 15:20:03 +0200
committerArne Schwabe <arne@rfc2549.org>2022-10-07 15:20:03 +0200
commit2243146d87311aa75c9c6d3fe120f393db0d75fa (patch)
tree917b26e18a6142979b4545895a1e69378daf975e
parent3200ed9b790b058e0a145028a0ae6cd7ca0d3c74 (diff)
Update runcoverity script to work under Linux
-rw-r--r--main/build.gradle.kts1
-rwxr-xr-xruncoverity.sh3
2 files changed, 3 insertions, 1 deletions
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index 044794e7..315546c5 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -15,6 +15,7 @@ plugins {
android {
compileSdk = 33
+ // Also update runcoverity.sh
ndkVersion = "25.1.8937393"
defaultConfig {
diff --git a/runcoverity.sh b/runcoverity.sh
index f6622155..0fd22617 100755
--- a/runcoverity.sh
+++ b/runcoverity.sh
@@ -14,6 +14,7 @@ cov-configure --config .coverity/cfg.xml --java
./gradlew -b build.gradle.kts --no-daemon clean
cov-build --dir .coverity/idir --config .coverity/cfg.xml ./gradlew -b build.gradle.kts --no-daemon assembleUiRelease
-cov-analyze --dir .coverity/idir --all --strip-path ${PWD}/main/src/main/cpp --strip-path ${PWD}/main/src --strip-path ${PWD} --strip-path /Users/arne/oss/android-sdk-macosx/ndk/21.1.6352462/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/
+NDK_VER=${NDK_VER:-25.1.8937393}
+cov-analyze --dir .coverity/idir --all --strip-path ${PWD}/main/src/main/cpp --strip-path ${PWD}/main/src --strip-path ${PWD} --strip-path ${ANDROID_HOME}/ndk/${NDK_VER}/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/ --strip-path ${ANDROID_HOME}/ndk/${NDK_VER}/toolchains/llvm/prebuilt/linux-x86_64/sysroot
cov-commit-defects --dir .coverity/idir --ssl -host ${COVERITY_CONNECT_HOST} --stream icsopenvpn-styx-master --auth-key-file ~/.coverity/auth-key.txt