CBL-6670: Code coverage script failing on arm64

couchbase · Jan 28, 2025 · 2867705 · 2867705
1 parent b10312d
commit 2867705
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/build_cmake/scripts/cover_macos.sh b/build_cmake/scripts/cover_macos.sh
@@ -28,9 +28,11 @@ pushd C/tests
 ./C4Tests -r quiet
 popd
 
+ARCH=$(lipo -info libLiteCore.dylib | awk '{print $NF}')
+
 mkdir -p coverage_reports
 xcrun llvm-profdata merge -sparse LiteCore/tests/default.profraw C/tests/default.profraw -o AllTests.profdata
-xcrun llvm-cov show -instr-profile=AllTests.profdata -show-line-counts-or-regions -arch x86_64 -output-dir=$PWD/coverage_reports -format="html" \
+xcrun llvm-cov show -instr-profile=AllTests.profdata -show-line-counts-or-regions -arch $ARCH -output-dir=$PWD/coverage_reports -format="html" \
   -ignore-filename-regex="/vendor/SQLiteCpp/*" -ignore-filename-regex="vendor/sockpp/*" -ignore-filename-regex="vendor/fleece/ObjC/*" \
   -ignore-filename-regex="vendor/fleece/vendor/*" -ignore-filename-regex="Networking/WebSockets/*" -ignore-filename-regex="C/c4DocEnumerator.cc" \
   -ignore-filename-regex="LiteCore/Query/N1QL_Parser/*" -ignore-filename-regex="*sqlite3*c" -ignore-filename-regex="*.leg" \
@@ -40,7 +42,7 @@ xcrun llvm-cov show -instr-profile=AllTests.profdata -show-line-counts-or-region
 if [ "$1" == "--show-results" ]; then
   open coverage_reports/index.html
 elif [ "$1" == "--export-results" ]; then
-  xcrun llvm-cov export -instr-profile=AllTests.profdata -arch x86_64 \
+  xcrun llvm-cov export -instr-profile=AllTests.profdata -arch $ARCH \
     -ignore-filename-regex="/vendor/SQLiteCpp/*" -ignore-filename-regex="vendor/sockpp/*" -ignore-filename-regex="vendor/fleece/ObjC/*" \
     -ignore-filename-regex="vendor/fleece/vendor/*" -ignore-filename-regex="Networking/WebSockets/*" -ignore-filename-regex="C/c4DocEnumerator.cc" \
     -ignore-filename-regex="LiteCore/Query/N1QL_Parser/*" -ignore-filename-regex="*sqlite3*c" -ignore-filename-regex="*.leg" \