Merge commit 'origin/master'

franzinc · Jul 1, 2009 · d8cf0b1 · d8cf0b1
2 parents 186eb24 + 7d636c0
commit d8cf0b1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .git-branch-name
 build.tmp
+test.out
diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,10 @@
 ** Please leave this at the top of the file.  Thanks.
 *******************************************************************************
 
+2009-07-01    <layer@HOBART128>
+
+	* makefile: dribble test output to "test.out" (mainly for windows)
+
 2009-06-30  Kevin Layer  <layer@gemini.franz.com>
 
 	* load.cl: remove removed files from *aserve-other-files*

diff --git a/makefile b/makefile
@@ -33,6 +33,7 @@ test: FORCE
 	rm -f build.tmp
 	echo '(setq excl::*break-on-warnings* t)' >> build.tmp
 	echo '(load "load.cl")' >> build.tmp
+	echo '(dribble "test.out")' >> build.tmp
 	echo '(load "test/t-aserve.cl")' >> build.tmp
 	echo '(exit util.test::*test-errors*)' >> build.tmp
 # -batch must come before -L, since arguments are evaluated from left to right