From: Julien Rioux <jrioux@physics.utoronto.ca>
Date: Sat, 14 Jan 2012 20:53:33 +0000 (-0500)
Subject: Regtest script: Keep the folder prefix in the name.
X-Git-Tag: release/2.15.27-1~35
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0fcf4d1e0764c8d261014c32d1b87c197cf5444d;p=lilypond.git

Regtest script: Keep the folder prefix in the name.

Two files with the same basename can occur under
two different folders. They should be tracked as
two separate files.
---

diff --git a/scripts/build/output-distance.py b/scripts/build/output-distance.py
index 63b2853dae..cf213da8b1 100755
--- a/scripts/build/output-distance.py
+++ b/scripts/build/output-distance.py
@@ -887,14 +887,18 @@ class ComparisonData:
                 self.compare_general_files (klasses[ext], f1, f2)
 
     def compare_general_files (self, klass, f1, f2):
+        prefix = os.path.commonprefix ([f1, f2])
         name = os.path.split (f1)[1]
+        name = os.path.join (prefix, name)
 
         file_link = klass (f1, f2)
         self.file_links[name] = file_link
 
     def compare_signature_files (self, f1, f2):
+        prefix = os.path.commonprefix ([f1, f2])
         name = os.path.split (f1)[1]
         name = re.sub ('-[0-9]+.signature', '', name)
+        name = os.path.join (prefix, name)
 
         file_link = None
         try: