From 4f9e438108cdb4564de142b18daf994255c06afb Mon Sep 17 00:00:00 2001
From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Sun, 19 Oct 2014 11:25:32 -0700
Subject: [PATCH] tests: Replace : with / so progress notes are not errors to
 Emacs.

Use - instead of : in timestamps reported by compile-svm.sh too.
---
 src/etc/compile-svm.sh       | 44 ++++++++++++++++++++----------------
 tests/runtime/test-arith.scm |  8 +++----
 tests/unit-testing.scm       |  4 ++--
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/etc/compile-svm.sh b/src/etc/compile-svm.sh
index cf45b1b8c..64e21ee31 100755
--- a/src/etc/compile-svm.sh
+++ b/src/etc/compile-svm.sh
@@ -30,29 +30,35 @@ set -e
 
 . etc/functions.sh
 
-echo "# `date`: Remove the cross-compiler's bands and stash its products."
+# To avoid miscuing GNU Emacs's compilation-mode.
+mydate ()
+{
+  date "+%Y-%m-%d %H-%M-%S"
+}
+
+echo "# `mydate`: Remove the cross-compiler's bands and stash its products."
 run_cmd rm -f lib/x-runtime.com
 run_cmd rm -f lib/x-compiler.com
 run_cmd ./Stage.sh remove 0
 run_cmd ./Stage.sh make-cross 0
 
-echo "# `date`: Restore the cross-compiler's host-compiled .coms."
+echo "# `mydate`: Restore the cross-compiler's host-compiled .coms."
 run_cmd ./Stage.sh unmake X
 
-echo "# `date`: Re-compile the cross-compiler."
+echo "# `mydate`: Re-compile the cross-compiler."
 
-echo "# `date`:    Re-syntax prerequisites."
+echo "# `mydate`:    Re-syntax prerequisites."
 for DIR in runtime sf cref; do
     run_cmd_in_dir ${DIR} "${@}" --batch-mode --load ${DIR}.sf </dev/null
 done
 
-echo "# `date`:    Re-compile prerequisites."
+echo "# `mydate`:    Re-compile prerequisites."
 for DIR in runtime sf cref; do
     run_cmd_in_dir ${DIR} "${@}" --batch-mode --load ${DIR}.cbf </dev/null
 done
 run_cmd_in_dir star-parser "${@}" --batch-mode --load compile.scm </dev/null
 
-echo "# `date`:    Dump new runtime into x-runtime.com."
+echo "# `mydate`:    Dump new runtime into x-runtime.com."
 get_fasl_file
 run_cmd_in_dir runtime \
     "${@}" --batch-mode --library ../lib --fasl "${FASL}" <<EOF
@@ -60,7 +66,7 @@ run_cmd_in_dir runtime \
 EOF
 echo ""
 
-echo "# `date`:    Re-syntax cross-compiler using x-runtime.com."
+echo "# `mydate`:    Re-syntax cross-compiler using x-runtime.com."
 run_cmd_in_dir compiler \
     "${@}" --batch-mode --library ../lib --band x-runtime.com <<EOF
 (begin
@@ -73,10 +79,10 @@ if [ -s compiler/compiler-unx.crf ]; then
     exit 1
 fi
 
-echo "# `date`:     Re-compile cross-compiler."
+echo "# `mydate`:     Re-compile cross-compiler."
 run_cmd_in_dir compiler "${@}" --batch-mode --load compiler.cbf </dev/null
 
-echo "# `date`: Dump cross-compiler into x-compiler.com."
+echo "# `mydate`: Dump cross-compiler into x-compiler.com."
 run_cmd "${@}" --batch-mode --library lib --band x-runtime.com <<EOF
 (begin
   (load-option 'SF)
@@ -86,10 +92,10 @@ run_cmd "${@}" --batch-mode --library lib --band x-runtime.com <<EOF
   (disk-save "lib/x-compiler.com"))
 EOF
 
-echo "# `date`: Remove host code to STAGEX/ subdirs."
+echo "# `mydate`: Remove host code to STAGEX/ subdirs."
 run_cmd ./Stage.sh make X
 
-echo "# `date`: Restore previously cross-compiled code."
+echo "# `mydate`: Restore previously cross-compiled code."
 # (Replace "unmake" with "remove" to start from scratch with each
 # rebuilt cross-compiler.)
 run_cmd ./Stage.sh unmake 0
@@ -106,7 +112,7 @@ if [ "${FAST}" ]; then
     # megaword smaller.
     HEAP=10000
 
-    echo "# `date`: Re-cross-compile everything."
+    echo "# `mydate`: Re-cross-compile everything."
     run_cmd "${@}" --batch-mode --library lib \
 		   --band x-compiler.com --heap ${HEAP} <<EOF
 (begin
@@ -117,7 +123,7 @@ if [ "${FAST}" ]; then
     (compile-everything)))
 EOF
 
-    echo "# `date`: Finish-cross-compilation of everything."
+    echo "# `mydate`: Finish-cross-compilation of everything."
     run_cmd_in_dir runtime \
 	../microcode/scheme --batch-mode --library ../lib \
 			    --fasl make.bin <<EOF
@@ -126,7 +132,7 @@ EOF
   (finish-cross-compilation:directory ".."))
 EOF
 
-    echo "# `date`: Ready to build-bands.sh with the new machine."
+    echo "# `mydate`: Ready to build-bands.sh with the new machine."
     exit 0
 
 fi
@@ -139,7 +145,7 @@ fi
 # memory" with --heap 8000 on i386 and x86-64.
 HEAP=9000
 
-echo "# `date`: Re-cross-compile boot-dirs."
+echo "# `mydate`: Re-cross-compile boot-dirs."
 run_cmd "${@}" --batch-mode --library lib \
     --band x-compiler.com --heap ${HEAP} <<EOF
 (begin
@@ -150,7 +156,7 @@ run_cmd "${@}" --batch-mode --library lib \
     (compile-boot-dirs compile-dir)))
 EOF
 
-echo "# `date`: Finish-cross-compilation of boot-dirs."
+echo "# `mydate`: Finish-cross-compilation of boot-dirs."
 run_cmd_in_dir runtime \
     ../microcode/scheme --batch-mode --library ../lib --fasl make.bin <<EOF
 (begin
@@ -158,7 +164,7 @@ run_cmd_in_dir runtime \
   (finish-cross-compilation:directory ".."))
 EOF
 
-echo "# `date`: Dump new compiler into boot-compiler.com."
+echo "# `mydate`: Dump new compiler into boot-compiler.com."
 run_cmd_in_dir runtime \
     ../microcode/scheme --batch-mode --library ../lib --fasl "${FASL}" <<EOF
 (begin
@@ -172,7 +178,7 @@ EOF
 
 run_cmd ./Stage.sh make-cross 0
 
-echo "# `date`: Use the new machine and compiler to re-compile everything."
+echo "# `mydate`: Use the new machine and compiler to re-compile everything."
 run_cmd ./microcode/scheme --batch-mode --library lib \
     --band boot-compiler.com --heap ${HEAP} <<EOF
 (begin
@@ -183,4 +189,4 @@ run_cmd ./microcode/scheme --batch-mode --library lib \
     (compile-everything)))
 EOF
 
-echo "# `date`: Ready to build-bands.sh with the new machine."
+echo "# `mydate`: Ready to build-bands.sh with the new machine."
diff --git a/tests/runtime/test-arith.scm b/tests/runtime/test-arith.scm
index d8e74d052..481b1b619 100644
--- a/tests/runtime/test-arith.scm
+++ b/tests/runtime/test-arith.scm
@@ -57,7 +57,7 @@ USA.
 (define (define-enumerated-test prefix elements procedure)
   (let ((n (vector-length elements)))
     (do ((i 0 (+ i 1))) ((>= i n))
-      (define-test (symbol prefix ': (vector-ref elements i))
+      (define-test (symbol prefix '/ (vector-ref elements i))
         (lambda ()
           (procedure (vector-ref elements i)))))))
 
@@ -67,8 +67,8 @@ USA.
       (do ((j 0 (+ j 1))) ((>= j n))
         (define-test
             (symbol prefix
-                    ': (vector-ref elements i)
-                    ': (vector-ref elements j))
+                    '/ (vector-ref elements i)
+                    '/ (vector-ref elements j))
           (lambda ()
             (procedure i (vector-ref elements i)
                        j (vector-ref elements j))))))))
@@ -138,4 +138,4 @@ USA.
 
 (define-enumerated-test 'X/NAN
   (vector (inf-) -2. -1 -0. 0 +0. +1 +2. (inf+))
-  (lambda (v) (assert-nan (/ v (nan)))))
+  (lambda (v) (assert-nan (/ v (nan)))))
\ No newline at end of file
diff --git a/tests/unit-testing.scm b/tests/unit-testing.scm
index 0d74dc953..8d5ae95c2 100644
--- a/tests/unit-testing.scm
+++ b/tests/unit-testing.scm
@@ -151,7 +151,7 @@ USA.
     (fresh-line port)
     (write-char #\; port)
     (write test-name port)
-    (write-string ": " port)
+    (write-char #\space port)
     (if (> n-failed 0)
 	(begin
 	  (write-string "failed " port)
@@ -185,7 +185,7 @@ USA.
 (define (report-test-failure prefix name failure port)
   (write-string prefix port)
   (write-string name port)
-  (write-string ": " port)
+  (write-char #\space port)
   (cond ((not failure) (write-string "passed" port))
 	((failure? failure) (report-failure failure port))
 	(else (error "Ill-formed failure:" failure)))
-- 
2.25.1