From 96d7ac4503dd8dfdbf0fda88fa5a9de577f2f124 Mon Sep 17 00:00:00 2001 From: bernhardheld Date: Sat, 15 Apr 2006 20:54:19 +0000 Subject: [PATCH] * support/regression/collate-results.py: fixed output in case of a valdiag error * support/regression/generate-cases.py: fixed splitting of pathnames with dots * as/hc08/lklibr.c, * as/mcs51/lklibr.c (addfile): fixed off-by-one bug git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4094 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 9 +++++++++ as/hc08/lklibr.c | 2 +- as/mcs51/lklibr.c | 2 +- support/regression/collate-results.py | 3 +++ support/regression/generate-cases.py | 6 +++--- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26dde108..ce6ce2a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-04-15 Bernhard Held + + * support/regression/collate-results.py: fixed output in case of + a valdiag error + * support/regression/generate-cases.py: fixed splitting of pathnames + with dots + * as/hc08/lklibr.c (addfile), + * as/mcs51/lklibr.c (addfile): fixed off-by-one bug + 2006-04-11 Raphael Neider * src/pic16/gen.c (getFreePtr, pic16_popRegFromString), diff --git a/as/hc08/lklibr.c b/as/hc08/lklibr.c index 74c8c361..eb33beaf 100644 --- a/as/hc08/lklibr.c +++ b/as/hc08/lklibr.c @@ -237,7 +237,7 @@ int addfile(char * path, char * libfil) That way putting 'path' and 'libfil' together will result into the original filepath as contained in 'str'.*/ int j; - path = (char *) new (strlen(str)); + path = (char *) new (strlen(str) + 1); strcpy(path, str); for(j=strlen(path)-1; j>=0; j--) { diff --git a/as/mcs51/lklibr.c b/as/mcs51/lklibr.c index c08b8580..bb7218f8 100644 --- a/as/mcs51/lklibr.c +++ b/as/mcs51/lklibr.c @@ -267,7 +267,7 @@ int addfile(char * path, char * libfil) That way putting 'path' and 'libfil' together will result into the original filepath as contained in 'str'.*/ int j; - path = (char *) new (strlen(str)); + path = (char *) new (strlen(str) + 1); strcpy(path, str); for(j=strlen(path)-1; j>=0; j--) { diff --git a/support/regression/collate-results.py b/support/regression/collate-results.py index 03f891a7..e58a981e 100644 --- a/support/regression/collate-results.py +++ b/support/regression/collate-results.py @@ -15,6 +15,9 @@ tests = 0 bytes = 0 ticks = 0 +# hack for valdiag +name = "" + for line in lines: if (re.search(r'^--- Running', line)): name = line diff --git a/support/regression/generate-cases.py b/support/regression/generate-cases.py index 81ebe8da..9c9bb045 100644 --- a/support/regression/generate-cases.py +++ b/support/regression/generate-cases.py @@ -68,8 +68,8 @@ class InstanceGenerator: self.functions = [] # Emit the suite wrapper into a temporary file self.tmpname = tempfile.mktemp() - (self.basename, self.ext) = re.split(r'\.', self.inname) - self.ext = '.' + self.ext + (self.dirname, self.filename) = os.path.split(self.inname) + (self.basename, self.ext) = os.path.splitext (self.filename) def permute(self, basepath, keys, trans = {}): """Permutes across all of the names. For each value, recursivly creates @@ -171,7 +171,7 @@ class InstanceGenerator: createdir(outdir) # Generate - self.permute(os.path.join(outdir, os.path.basename(self.basename)), self.replacements.keys()) + self.permute(os.path.join(outdir, self.basename), self.replacements.keys()) # Remove the temporary file os.remove(self.tmpname) -- 2.30.2