summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rwxr-xr-xtools/coverage/FilterLCovData.py2
-rwxr-xr-xtools/coverage/GenerateCoverageResults.sh4
3 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 01857aa..7a5c1eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
*.dep
*.gcda
*.gcno
diff --git a/tools/coverage/FilterLCovData.py b/tools/coverage/FilterLCovData.py
index 4127874..8b8d24e 100755
--- a/tools/coverage/FilterLCovData.py
+++ b/tools/coverage/FilterLCovData.py
@@ -15,6 +15,8 @@ for line in inputFile.readlines() :
if line.startswith("SF:") and (line.find("/Swiften/") == -1 or line.find("/UnitTest/") != -1 or line.find("/QA/") != -1 or line.find("/3rdParty/") != -1):
inIgnoredFile = True
else :
+ if line.startswith("SF:") :
+ line = line.replace("/./Swiften/", "/Swiften/")
output.append(line)
inputFile.close()
diff --git a/tools/coverage/GenerateCoverageResults.sh b/tools/coverage/GenerateCoverageResults.sh
index a902f4d..75efaa9 100755
--- a/tools/coverage/GenerateCoverageResults.sh
+++ b/tools/coverage/GenerateCoverageResults.sh
@@ -31,11 +31,11 @@ $LCOVDIR/lcov --zerocounters --directory $SOURCE_DIR
# All tests
make -C $SOURCE_DIR test
$LCOVDIR/lcov --capture --directory $SOURCE_DIR -b $SOURCE_DIR --output-file $OUTPUT_DIR/all.info --test-name all
-#$SCRIPT_DIR/FilterLCovData.py $OUTPUT_DIR/all.info
+$SCRIPT_DIR/FilterLCovData.py $OUTPUT_DIR/all.info
# Generate HTML
$LCOVDIR/gendesc -o $OUTPUT_DIR/descriptions $SCRIPT_DIR/descriptions.txt
-$LCOVDIR/genhtml --title "Swift Coverage" --output-directory $OUTPUT_DIR $OUTPUT_DIR/all.info
+$LCOVDIR/genhtml --no-function-coverage --title "Swift Coverage" --output-directory $OUTPUT_DIR $OUTPUT_DIR/all.info
# Generate summary
$SCRIPT_DIR/GenerateSummary.py $OUTPUT_DIR/all.info $OUTPUT_DIR/summary