# HG changeset patch
# User thomask
# Date 1115921601 0
# Node ID 924f45bc62e9e2991af5622395ccab1ee0f5a55e
# Parent  9e0847cf535acba26443124cd5b77172d2668473
post DMD-0.123 review [1/n]

diff -r 9e0847cf535a -r 924f45bc62e9 Makefile
--- a/Makefile	Thu May 12 11:13:04 2005 +0000
+++ b/Makefile	Thu May 12 18:13:21 2005 +0000
@@ -154,12 +154,14 @@
 #
 # target should fail to compile
 #
-nocompile : $(dstress__)
-	rm -f nocompile/*.o nocompile/*.$(ext_nocompile)
-	find nocompile -maxdepth 1 -name "?*.?*" | grep "." | sort --ignore-case | xargs -n 1 echo "$(dstress__) nocompile" > nocompile.sh
+nocompile : $(dstress__) nocompile_clean
+	find nocompile -type f | grep -v ".svn" | sort --ignore-case | xargs -n 1 echo "$(dstress__) nocompile" > nocompile.sh
 	chmod +x nocompile.sh
 	./nocompile.sh 2>> $(LOG)
 
+nocompile_clean :
+	$(eval z_rm = $(shell find nocompile -type f  -name "*\\.o" | grep -v ".svn"))
+
 # used in some complex test cases
 define analyse_nocompile
 	@if $(ifeq__) $(z_return) 0 ; then \
@@ -180,12 +182,14 @@
 #
 # target should compile (excludes linking)
 #
-compile : $(dstress__)
-	rm -f compile/*.o compile/*.$(ext_compile)
-	find compile -maxdepth 1 -name "?*.?*" | grep "." | sort --ignore-case | xargs -n 1 echo "$(dstress__) compile" > compile.sh
+compile : $(dstress__) compile_clean
+	find compile -type f | grep -v ".svn" | sort --ignore-case | xargs -n 1 echo "$(dstress__) compile" > compile.sh
 	chmod +x compile.sh
 	./compile.sh 2>> $(LOG)
 
+compile_clean :
+	$(eval z_rm = $(shell find compile -type f  -name "*\\.o" | grep -v ".svn"))
+
 # used in some complex test cases
 define analyse_compile
 	@if $(ifeq__) $(z_return) 0 ; then \
@@ -202,12 +206,15 @@
 # 
 # target should compile, link and run
 # 
-run : $(dstress__)
-	rm -f run/*.exe run/*.$(ext_run)
-	find run -maxdepth 1 -name "?*.?*" | grep "." | sort --ignore-case | xargs -n 1 echo "$(dstress__) run" > run.sh
+run : $(dstress__) run_clean
+	find run -type f | grep -v ".svn" | sort --ignore-case | xargs -n 1 echo "$(dstress__) run" > run.sh
 	chmod +x run.sh
 	./run.sh 2>> $(LOG)
 
+run_clean :
+	$(eval z_rm = $(shell find run -type f  -name "*\\.exe" | grep -v ".svn"))
+	$(RM) $(z_rm)
+
 # used in some complex testcases
 define analyse_run
 	@if $(ifeq__) $(z_return) 0 ; then \
@@ -267,12 +274,15 @@
 #
 # target should compile and link but fail to run
 # 
-norun : $(dstress__)
-	rm -f norun/*.exe norun/*.$(ext_norun)
-	find norun -maxdepth 1 -name "?*.?*" | grep "." | sort --ignore-case | xargs -n 1 echo "$(dstress__) norun" > norun.sh
+norun : $(dstress__) norun_clean
+	find norun -type f | grep -v ".svn" | sort --ignore-case | xargs -n 1 echo "$(dstress__) norun" > norun.sh
 	chmod +x norun.sh
 	./norun.sh 2>> $(LOG)
 
+norun_clean :
+	$(eval z_rm = $(shell find norun -type f  -name "*\\.exe" | grep -v ".svn"))
+	$(RM) $(z_rm)
+
 # used in some complex test cases
 define analyse_norun
 	@if $(ifeq__) $(z_return) 0; then \
@@ -311,9 +321,8 @@
 #
 # remove targets and all temp objects
 #
-clean : $(sort $(subst $(complex_todo),clean,$(complex_makefiles)))
-	$(RM) $(OBJ_DIR)/?*.?* nocompile/?*.$(ext_log)
-	$(RM) run/?*.$(ext_run) norun/?*.$(ext_norun) compile/?*.$(ext_compile) nocompile/?*.$(ext_nocompile)
+clean : $(sort $(subst $(complex_todo),clean,$(complex_makefiles))) nocompile_clean compile_clean norun_clean run_clean
+	$(RM) $(z_rm) $(OBJ_DIR)/?*\\..*
 	$(RM) run.sh norun.sh compile.sh nocompile.sh
 
 # the empty line above has to remain, otherwise some weired problems can arise
diff -r 9e0847cf535a -r 924f45bc62e9 nocompile/a/array_initialization_10.d
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nocompile/a/array_initialization_10.d	Thu May 12 18:13:21 2005 +0000
@@ -0,0 +1,17 @@
+// $HeadURL$
+// $Date$
+// $Author$
+
+// @author@	zwang <nehzgnaw@gmail.com>
+// @date@	2005-04-17
+// @uri@	news:d3sq2j$1086$1@digitaldaemon.com
+
+// __DSTRESS_ELINE__ 14
+
+module dstress.nocompile.a.array_initialization_10;
+
+int main(){
+	static char a[int.max/32]= [0];
+	return 0;
+}
+
diff -r 9e0847cf535a -r 924f45bc62e9 nocompile/bug_dsymbol_611_A.d
--- a/nocompile/bug_dsymbol_611_A.d	Thu May 12 11:13:04 2005 +0000
+++ b/nocompile/bug_dsymbol_611_A.d	Thu May 12 18:13:21 2005 +0000
@@ -7,7 +7,7 @@
 // @uri@	news:cqml2m$1ujj$1@digitaldaemon.com
 // @url@	nntp://digitalmars.com/digitalmars.D.bugs/2604
 
-// __DSTRESS_ELINE__ 18
+// __DSTRESS_ELINE__ 21
 
 module dstress.nocompile.bug_dsymbol_611_A;
 
diff -r 9e0847cf535a -r 924f45bc62e9 nocompile/c/creal_25.d
--- a/nocompile/c/creal_25.d	Thu May 12 11:13:04 2005 +0000
+++ b/nocompile/c/creal_25.d	Thu May 12 18:13:21 2005 +0000
@@ -10,6 +10,6 @@
 
 module dstress.nocompile.c.creal_25;
 
-void test{
+void test(){
 	creal c = 27Li;
 }
diff -r 9e0847cf535a -r 924f45bc62e9 run/array_initialization_10.d
--- a/run/array_initialization_10.d	Thu May 12 11:13:04 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-// $HeadURL$
-// $Date$
-// $Author$
-
-// @author@	zwang <nehzgnaw@gmail.com>
-// @date@	2005-04-17
-// @uri@	news:d3sq2j$1086$1@digitaldaemon.com
-
-
-module dstress.run.array_initialization_10;
-
-int main(){
-	static char a[int.max/32]= [0];
-	return 0;
-}
-
diff -r 9e0847cf535a -r 924f45bc62e9 run/b/bug_cod1_2433_C.d
--- a/run/b/bug_cod1_2433_C.d	Thu May 12 11:13:04 2005 +0000
+++ b/run/b/bug_cod1_2433_C.d	Thu May 12 18:13:21 2005 +0000
@@ -9,7 +9,7 @@
 module dstress.run.b.bug_cod1_2433_C;
 
 ireal test(){
-	return 1.0L;
+	return 1.0Li;
 }
 
 int main(){
diff -r 9e0847cf535a -r 924f45bc62e9 run/b/bug_cod1_2433_E.d
--- a/run/b/bug_cod1_2433_E.d	Thu May 12 11:13:04 2005 +0000
+++ b/run/b/bug_cod1_2433_E.d	Thu May 12 18:13:21 2005 +0000
@@ -9,7 +9,7 @@
 module dstress.run.b.bug_cod1_2433_E;
 
 ireal test(){
-	return 1.0L;
+	return 1.0Li;
 }
 
 int main(){