update build-coverage.sh script

diff --git a/buildscripts/build-coverage.sh b/buildscripts/build-coverage.sh
index cdf31dd7d3249b58b339807939b394dc1f5cb1dd..5af2bb1d7f116caf8cb234e5ba41ee48ffdf8e55 100755 (executable)
--- a/buildscripts/build-coverage.sh
+++ b/buildscripts/build-coverage.sh
@@ -1,14 +1,15 @@
 #!/bin/sh
 ./configure --enable-config=cov --disable-optimising
 make conf=cov -j2 clean
-perl -i~ -pe 's/-pipe /-fprofile-arcs -ftest-coverage/g' config-cov.make
+perl -i~ -pe 's/-pipe /-fprofile-arcs -ftest-coverage -pipe /g' config-cov.make
+perl -i~ -pe 's/ -ldl / -lgcov -ldl /g' config-cov.make
 make conf=cov -j2
 make conf=cov test-clean LILYPOND_JOBS=          
-make conf=cov test LILYPOND_JOBS=          
+make conf=cov test LILYPOND_JOBS= >& out-cov/test-run.log
 
 cd out-cov
 ln ../lily/* .
-ln ../lily/out-conv/*cc .
+ln ../lily/out-cov/*[ch] .
 mkdir include
 ln ../lily/include/* include/
 for a in *[cyl]

diff --git a/buildscripts/coverage.py b/buildscripts/coverage.py
index 259f0be06d20c96d70451bc4e18144ff5eb0b6b9..e8cb903a97e14b11944675d70eb067e517bb59f9 100644 (file)
--- a/buildscripts/coverage.py
+++ b/buildscripts/coverage.py
@@ -3,19 +3,6 @@ import os
 import glob
 import re
 
-cmds = """
-./configure --enable-config=cov --disable-optimising
-make conf=cov -j2
-make conf=cov test LILYPOND_JOBS=          
-
-cd out-cov
-ln ../lily/* .
-ln ../lily/out-conv/*cc .
-mkdir include
-ln ../lily/include/* include/
-for a in *[cyl] ; do  gcov -o ../lily/out-cov/  -p $a > $a.gcov-summary ; done 
-"""
-
 os.chdir ('out-cov')
 
 #File 'accidental-engraver.cc'
@@ -25,7 +12,8 @@ results = []
 for f in glob.glob ('*.gcov-summary'):
     str = open (f).read ()
     m = re.search ("File '([^']+.cc)'\s*Lines executed:([0-9.]+)% of ([0-9]+)", str)
-    if '/usr/lib' in m.group (1):
+
+    if m and '/usr/lib' in m.group (1):
         continue
    
     if m: