Author: ek.kato
Date: Wed Oct 29 01:18:22 2008
New Revision: 5610
Modified:
trunk/test/run-test.scm
trunk/test/uim-test-utils.scm
Log:
* test/uim-test-utils.scm
- Require GaUnit 0.1.6.
- Fix to wait *uim-sh-process*
* test/run-test.scm
- Support 'test/run-test.scm test/test-something.scm' kind of
invocation.
- Fix file globbing.
Modified: trunk/test/run-test.scm
==============================================================================
--- trunk/test/run-test.scm (original)
+++ trunk/test/run-test.scm Wed Oct 29 01:18:22 2008
@@ -44,8 +44,10 @@
(define gaunit-main main)
(define (main args)
- (gaunit-main
- (append args
- (if (symbol-bound? 'glob)
- (glob (uim-test-build-path "test" "**" "test-*.scm"))
- (sys-glob (uim-test-build-path "test" "test-*.scm"))))))
+ (let ((args (if (null? (cdr args))
+ (append args
+ (if (symbol-bound? 'glob)
+ (glob (uim-test-build-path "test" "test-*.scm"))
+ (sys-glob
(uim-test-build-path "test" "test-*.scm"))))
+ args)))
+ (gaunit-main args)))
Modified: trunk/test/uim-test-utils.scm
==============================================================================
--- trunk/test/uim-test-utils.scm (original)
+++ trunk/test/uim-test-utils.scm Wed Oct 29 01:18:22 2008
@@ -38,8 +38,8 @@
;; backtrace following an error.
(define UIM-SH-MULTILINE-ERROR #t)
-(if (version<? *gaunit-version* "0.1.1")
- (error "GaUnit 0.1.1 is required"))
+(if (version<? *gaunit-version* "0.1.6")
+ (error "GaUnit 0.1.6 is required"))
(sys-putenv "LIBUIM_SYSTEM_SCM_FILES"
(uim-test-build-path "sigscheme" "lib"))
(sys-putenv "LIBUIM_SCM_FILES" (uim-test-build-path "scm"))
@@ -131,6 +131,7 @@
(uim '(%%set-current-error-port! (current-output-port))))
(define (*uim-sh-teardown-proc*)
(close-input-port (process-input *uim-sh-process*))
+ (process-wait *uim-sh-process*)
(set! *uim-sh-process* #f))
(define-syntax define-uim-test-case
