undo changes for now because of strange python problems with some ports

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2457 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/support/regression/Makefile b/support/regression/Makefile
index 801d4681784f0ad3036ac0e67ca274c635d73e3b..a6301688e78a468c031f3dc4cf3cce030c6b2fa5 100644 (file)
--- a/support/regression/Makefile
+++ b/support/regression/Makefile
@@ -146,8 +146,11 @@ SDCCFLAGS += -Ifwk/include -Itests
 # Rule to generate the iterations of a test suite off the soure suite.
 $(PORT_CASES_DIR)/%/iterations.stamp: $(TESTS_DIR)/%.c $(GENERATE_CASES)
        echo Processing $<
+       rm -rf $(CASES_DIR)/$(PORT)/$(TESTS_NAME)
+       mkdir -p $(CASES_DIR)/$(PORT)/$(TESTS_NAME)
        mkdir -p `dirname $@`
-       python $(GENERATE_CASES) $< `dirname $@` > /dev/null
+       python $(GENERATE_CASES) $< $(CASES_DIR)/$(PORT) > /dev/null
+       cp $(CASES_DIR)/$(PORT)/$(TESTS_NAME)/*.c `dirname $@`
        touch $@
 
 # Rule linking the combined results log to all of the files in the

diff --git a/support/regression/generate-cases.py b/support/regression/generate-cases.py
index 55839e9130f38c7b762d76755ded34c5e6ff1352..18b55e9e28affd51a002b43002b7a36dcf6cf704 100644 (file)
--- a/support/regression/generate-cases.py
+++ b/support/regression/generate-cases.py
@@ -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)