summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'tools/coverage')
-rwxr-xr-xtools/coverage/FilterLCovData.py2
-rwxr-xr-xtools/coverage/GenerateCoverageResults.sh12
2 files changed, 12 insertions, 2 deletions
diff --git a/tools/coverage/FilterLCovData.py b/tools/coverage/FilterLCovData.py
index b0d180f..4127874 100755
--- a/tools/coverage/FilterLCovData.py
+++ b/tools/coverage/FilterLCovData.py
@@ -12,7 +12,7 @@ for line in inputFile.readlines() :
if line == "end_of_record\n" :
inIgnoredFile = False
else :
- if line.startswith("SF:") and (line.find("/Swift/") == -1 or line.find("/UnitTest/") != -1 or line.find("/QA/") != -1 or line.find("/3rdParty/") != -1):
+ 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 :
output.append(line)
diff --git a/tools/coverage/GenerateCoverageResults.sh b/tools/coverage/GenerateCoverageResults.sh
index 9c8a3d7..a902f4d 100755
--- a/tools/coverage/GenerateCoverageResults.sh
+++ b/tools/coverage/GenerateCoverageResults.sh
@@ -3,6 +3,16 @@
# This script assumes that it is run from the toplevel directory, that
# the 'configure' script has been called with '--enable-coverage'
+if [ ! -f config.status ]; then
+ echo "Please configure your build with --enable-coverage and rebuild."
+ exit -1
+fi
+grep -q "\-\-enable-coverage" config.status
+if [ "$?" != 0 ]; then
+ echo "Please configure your build with --enable-coverage and rebuild."
+ exit -1
+fi
+
SOURCE_DIR=.
SCRIPT_DIR=tools/coverage
LCOVDIR=3rdParty/LCov
@@ -21,7 +31,7 @@ $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