From aba6c8799c831db5928209f9842efe721b6708ab Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 5 Jan 2007 14:41:21 +0100 Subject: [PATCH] further test fixes: trim git-diff output. --- GNUmakefile.in | 4 ++-- buildscripts/output-distance.py | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index d8b725b7e1..f51a05b19d 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -213,8 +213,8 @@ OUT_TEST=test test: - rm -f input/regression/out-test/collated-files.html - $(MAKE) -C input/regression/ out=$(OUT_TEST) LILYPOND_BOOK_LILYPOND_FLAGS="--backend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-test/collated-files.html + rm -f input/regression/out-$(OUT_TEST)/collated-files.html + $(MAKE) -C input/regression/ out=$(OUT_TEST) LILYPOND_BOOK_LILYPOND_FLAGS="--backend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-$(OUT_TEST)/collated-files.html @find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' if test -d .git ; then \ echo -e 'HEAD is:\n\n\t' ; \ diff --git a/buildscripts/output-distance.py b/buildscripts/output-distance.py index 8939ab27b2..5aa5dfcb6e 100644 --- a/buildscripts/output-distance.py +++ b/buildscripts/output-distance.py @@ -439,7 +439,14 @@ class FileCompareLink (FileLink): class GitFileCompareLink (FileCompareLink): def get_cell (self, oldnew): - return self.contents[oldnew] + str = self.contents[oldnew] + + # truncate long lines + str = '\n'.join ([l[:80] for l in str.split ('\n')]) + + + str = '
%s
' % str + return str def calc_distance (self): if self.contents[0] == self.contents[1]: @@ -461,7 +468,7 @@ class TextFileCompareLink (FileCompareLink): self.diff_lines = [l for l in diff] self.diff_lines = self.diff_lines[2:] - return float (len ([l for l in self.diff_lines if l[0] in '-+'])) + return math.sqrt (float (len ([l for l in self.diff_lines if l[0] in '-+']))) def get_cell (self, oldnew): str = '' @@ -510,7 +517,7 @@ class ProfileFileLink (FileCompareLink): } for k in ('time', 'cells'): - dist += math.exp (self.get_ratio (k) * factor[k]) - 1 + dist += math.tan (self.get_ratio (k) /(0.5* math.pi)) * factor[k] - 1 dist = min (dist, 100) return dist -- 2.39.2