changeset 53:5f0e612a804b

updated complex make files
author thomask
date Fri, 22 Oct 2004 05:40:17 +0000
parents a6a3c5e97e9d
children 94d73d5e528e
files complex/command_line/..d complex/command_line/complex.mak complex/debug/complex.mak complex/private_import/complex.mak complex/unittest/complex.mak
diffstat 5 files changed, 32 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/complex/command_line/..d	Fri Oct 22 05:40:17 2004 +0000
@@ -0,0 +1,6 @@
+module cmd_dummy;
+
+
+int main(){
+	return 0;
+}
--- a/complex/command_line/complex.mak	Sat Oct 16 23:17:53 2004 +0000
+++ b/complex/command_line/complex.mak	Fri Oct 22 05:40:17 2004 +0000
@@ -22,12 +22,13 @@
 	complex/command_line/clean
 
 complex/command_line/warning :
-	@echo "don't invoke this file directly, instead use DStress' root Makefile with the target \"complex\" or \"all\""
-
+	@echo "don't invoke this file directly, instead use DStress' root Makefile with the target \"coplex/command_line/coplex.done\", \"complex\" or \"all\""
 
 #
-# name__command_line_arguments.cmdrun
-# name__command_line_arguments.cmdfail
+# name__command__line__arguments.cmdrun
+# name__command__line__arguments.cmdfail
+# name__command__line__arguments.cmdnullfail
+#
 # all double underscores in the arguments will be replaced by whitespace 
 #
 complex/command_line/raw = \
@@ -42,10 +43,16 @@
 	complex/command_line/command_line_null_source_02__.cmdnullfail \
 	complex/command_line/command_line_null_source_03__-c__"".cmdnullfail \
 	complex/command_line/command_line_null_source_04__"".cmdnullfail \
+	complex/command_line/command_line_null_source_05__-c__..d.cmdnullfail \
+	complex/command_line/command_line_null_source_06__..d.cmdnullfail
 
 # the actual target, will be called by root's "all" / "complex" target
 complex/command_line/$(complex_done) : $(complex/command_line/raw)
 
+#
+# try running with "dummy.d" as the source
+# (should succeed)
+# 
 %.cmdrun : complex/command_line/dummy.$(ext_source)
 	$(eval z_raw = $(subst __, ,$*))
 	$(eval z_name = $(word 1,$(z_raw)))
@@ -56,6 +63,10 @@
 		$(ECHO) "XFAIL: $(z_name)"; \
 	fi
 
+#
+# try running with "dummy.d" as the source
+# (should fail)
+#
 %.cmdfail : complex/command_line/dummy.$(ext_source)
 	$(eval z_raw = $(subst __, ,$*))
 	$(eval z_name = $(word 1,$(z_raw)))
@@ -66,7 +77,11 @@
 		$(ECHO) "FAIL:  $(z_name)"; \
 	fi
 
-%.cmdnullfail : complex/command_line/dummy.$(ext_source)
+#
+# try running without any additional source agruments
+# (should fail)
+#
+%.cmdnullfail : 
 	$(eval z_raw = $(subst __, ,$*))
 	$(eval z_name = $(word 1,$(z_raw)))
 	$(eval z_arg = $(subst $(z_name),,$(z_raw)))
@@ -78,5 +93,5 @@
 	
 # this will be called by root's "clean" target
 complex/command_line/clean :
-	$(RM) complex/command_line/*.done
+	$(RM) complex/command_line/*.done complex/command_line/*.xxxx complex/command_line/*.$(ext_compile)
 
--- a/complex/debug/complex.mak	Sat Oct 16 23:17:53 2004 +0000
+++ b/complex/debug/complex.mak	Fri Oct 22 05:40:17 2004 +0000
@@ -22,7 +22,7 @@
 	complex/debug/clean 
 
 complex/debug/warning :
-	@echo "don't invoke this file directly, instead use DStress' root Makefile with the target \"complex\" or \"all\""
+	@echo "don't invoke this file directly, instead use DStress' root Makefile with the target \"complex/debug/complex.done\" \"complex\" or \"all\""
 
 # this will be called by root's "all" / "complex" target
 complex/debug/$(complex_done) : complex/debug/debug_01.$(ext_run) complex/debug/debug_02.$(ext_run) complex/debug/debug_03.$(ext_run)
--- a/complex/private_import/complex.mak	Sat Oct 16 23:17:53 2004 +0000
+++ b/complex/private_import/complex.mak	Fri Oct 22 05:40:17 2004 +0000
@@ -22,7 +22,7 @@
 	complex/private_import/clean
 
 complex/private_import/warning :
-	@echo "don't invoke this file directly, instead use DStress' root Makefile with the target \"complex\" or \"all\""
+	@echo "don't invoke this file directly, instead use DStress' root Makefile with the target \"complex/private_import/complex.done\", \"complex\" or \"all\""
 
 # the actual target, will be called by root's "all" / "complex" target
 complex/private_import/$(complex_done) : complex/private_import/private_import_01.done complex/private_import/private_import_02.done
--- a/complex/unittest/complex.mak	Sat Oct 16 23:17:53 2004 +0000
+++ b/complex/unittest/complex.mak	Fri Oct 22 05:40:17 2004 +0000
@@ -23,10 +23,10 @@
 	complex/unittest/nocompile \
 	complex/unittest/clean 
 
-ext_unittest_run = unit.$(ext_run)
+complex/unittest/warning :
+	@echo "don't invoke this file directly, instead use DStress' root Makefile with the target \"complex/unittest/complex.done\", \"complex\" or \"all\""
 
-complex/unittest/warning :
-	@echo "don't invoke this file directly, instead use DStress' root Makefile with the target \"complex\" or \"all\""
+ext_unittest_run = unit.$(ext_run)
 
 # this will be called by root's "all" / "complex" target
 complex/unittest/$(complex_done) : complex/unittest/run complex/unittest/nocompile