From 359b769ce563068a3ed777de5c051b10e966b48a Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 23 Jan 2007 15:59:41 +0100 Subject: [PATCH] scheme coverage generation fixes. --- buildscripts/build-coverage.sh | 1 + buildscripts/coverage.py | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/buildscripts/build-coverage.sh b/buildscripts/build-coverage.sh index abbc65dab7..b86ebaaf52 100755 --- a/buildscripts/build-coverage.sh +++ b/buildscripts/build-coverage.sh @@ -38,6 +38,7 @@ cd $resultdir ln $depth/lily/* . ln $depth/scm/*.scm . +mv $depth/input/regression/out-testcov/*.scm.cov . ln $depth/ly/*.ly . ln $depth/lily/out-cov/*[ch] . mkdir include diff --git a/buildscripts/coverage.py b/buildscripts/coverage.py index a06a943d14..0b3b2b7aaf 100644 --- a/buildscripts/coverage.py +++ b/buildscripts/coverage.py @@ -75,10 +75,14 @@ class Chunk: class SchemeChunk (Chunk): def uncovered_score (self): text = self.text () - if (text.startswith ('(define') + if (text.startswith ('(define ') and not text.startswith ('(define (')): return 0 + if (text.startswith ('(define-public ') + and not text.startswith ('(define-public (')): + return 0 + return len ([l for (c,n,l) in self.lines() if (c == 0)]) def read_gcov (f): @@ -140,7 +144,7 @@ def get_scm_chunks (ls, file): last_c = -1 for (cov_count, line_number, line) in ls: - if line.startswith ('(define'): + if line.startswith ('('): new_chunk () last_c = -1 -- 2.39.5