From 833aa26bacd03e111d5f4f59cdd70f48b6572e47 Mon Sep 17 00:00:00 2001
From: bernhardheld <bernhardheld@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Tue, 1 Apr 2003 08:10:22 +0000
Subject: [PATCH] * support/regression/generate-cases.py: place generated file
 in given sub directory * support/regression/ports/host/spec.mk: prevent
 removal of testfwk.o * support/regression/Makefile: improvements for 'make
 -j'; side effect: it's simpler and faster now

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2456 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 ChangeLog                             | 7 +++++++
 support/regression/Makefile           | 5 +----
 support/regression/generate-cases.py  | 2 +-
 support/regression/ports/host/spec.mk | 3 +++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7498690b..b8d4ce74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-01  Bernhard Held <bernhard@bernhardheld.de>
+
+	* support/regression/generate-cases.py: place generated file in given sub directory
+	* support/regression/ports/host/spec.mk: prevent removal of testfwk.o
+	* support/regression/Makefile: improvements for 'make -j';
+	side effect: it's simpler and faster now
+
 2003-03-31  Borut Razem <borut.razem@siol.net>
 
 	* src/z80/main.c: link-{port} and as-{port} defined without path
diff --git a/support/regression/Makefile b/support/regression/Makefile
index a6301688..801d4681 100644
--- a/support/regression/Makefile
+++ b/support/regression/Makefile
@@ -146,11 +146,8 @@ 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) $< $(CASES_DIR)/$(PORT) > /dev/null
-	cp $(CASES_DIR)/$(PORT)/$(TESTS_NAME)/*.c `dirname $@`
+	python $(GENERATE_CASES) $< `dirname $@` > /dev/null
 	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 18b55e9e..55839e91 100644
--- 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, self.basename), self.replacements.keys())
+        self.permute(os.path.join(outdir, os.path.basename(self.basename)), self.replacements.keys())
 
         # Remove the temporary file
         os.remove(self.tmpname)
diff --git a/support/regression/ports/host/spec.mk b/support/regression/ports/host/spec.mk
index 077e1df5..ce2c4a55 100644
--- a/support/regression/ports/host/spec.mk
+++ b/support/regression/ports/host/spec.mk
@@ -4,6 +4,9 @@ SDCCFLAGS = -DPORT_HOST=1 -Wall -fsigned-char -DREENTRANT=
 
 EXEEXT = .bin
 
+# otherwise `make` deletes it and `make -j`will fail
+.PRECIOUS: ports/$(PORT)/testfwk$(OBJEXT)
+
 # Required extras
 EXTRAS = ports/$(PORT)/testfwk$(OBJEXT) ports/$(PORT)/support$(OBJEXT)
 
-- 
2.39.5