From 82d8d8f5095a17b44d689552ed3c52dc9616d099 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <tunes@google.com>
Date: Thu, 7 May 2015 11:52:42 -0400
Subject: [PATCH] Tweak test-program output.

---
 test/make-hello-world.lisp |  3 ++-
 test/test-program.script   | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/make-hello-world.lisp b/test/make-hello-world.lisp
index 749583fc..e5fcbd87 100644
--- a/test/make-hello-world.lisp
+++ b/test/make-hello-world.lisp
@@ -30,7 +30,8 @@
 (defun make-hello-bundle (operation)
   (operate 'load-bundle-op :hello-world-example)
   (operate operation :hello-world-example)
-  #+mkcl (add-mkcl-dll (asdf::output-file operation :hello-world-example)))
+  #+mkcl (add-mkcl-dll (asdf::output-file operation :hello-world-example))
+  (quit 0))
 
 (defun make-hello-image ()
   (make-hello-bundle 'image-op))
diff --git a/test/test-program.script b/test/test-program.script
index a8ec2bcf..d2db138b 100644
--- a/test/test-program.script
+++ b/test/test-program.script
@@ -40,7 +40,7 @@
      #+allegro :lisp-path #+allegro *lisp*
      :cross-compile nil
      :load (native-namestring (subpathname *test-directory* "make-hello-world.lisp"))
-     :eval (format nil "(asdf-test::make-hello-~a)" kind)
+     :eval (format nil "(asdf-test::make-hello-~(~a~))" kind)
      :run-program-args
      `(:input nil :ignore-error-status t
        :output (,*standard-output* :linewise t :prefix "stdout: ")
@@ -56,7 +56,7 @@
   (make-hello-world 'image)
   (assert (probe-file* img) () "Can't find image file ~S" img)
 
-  (DBG "- then, use it")
+  (DBG "- then use this executable image")
   (assert-equal
    (nest
     #+lispworks (last)
@@ -68,7 +68,7 @@
      :run-program-args '(:output :lines :error-output t)))
    '("hello, world"))
 
-  (DBG "- now, use it with arguments")
+  (DBG "- now, use this executable image with arguments")
   #-(or lispworks scl) ;; These can't be passed arguments the normal way
   (assert-equal
    (lisp-invocation:invoke-lisp
@@ -102,11 +102,11 @@
   (make-hello-world 'program)
   (assert (probe-file* exe) () "Can't find executable file ~S" exe)
 
-  (DBG "- use that")
+  (DBG "- use that standalone program")
   (assert-equal (run-program `(,(native-namestring exe)) :output :lines :error-output t)
                 '("hello, world"))
 
-  (DBG "- use that with arguments")
+  (DBG "- use that standalone program with arguments")
   (assert-equal (run-program `(,(native-namestring exe) "a" "b c" "d") :output :lines :error-output t)
                 '("hello, world"
                   "You passed 3 arguments:"
-- 
GitLab