From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Thu, 8 May 2014 04:38:45 +0000 (-0700)
Subject: Merge branch 'master' into Gtk.
X-Git-Tag: mit-scheme-pucked-9.2.12~412
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=c8388749680693b4d0f261dc6151e14ee450f90c;p=mit-scheme.git

Merge branch 'master' into Gtk.
---

c8388749680693b4d0f261dc6151e14ee450f90c
diff --cc tests/ffi/test-ffi.scm
index 22214c2a5,52c6b81dd..5454d6716
--- a/tests/ffi/test-ffi.scm
+++ b/tests/ffi/test-ffi.scm
@@@ -28,16 -28,19 +28,18 @@@ USA
  
  (with-working-directory-pathname (directory-pathname (current-load-pathname))
    (lambda ()
-     (let ((code
- 	   (with-notification
- 	    (lambda (port)
- 	      (write-string "make all" port))
- 	    (lambda ()
- 	      (run-synchronous-subprocess "make" (list "all"))))))
-       (if (not (zero? code))
- 	  (warn "Test library build failed:" code)
+     (let ((port (notification-output-port)))
+       (fresh-line port)
+       (write-string "make all in tests/ffi/" port)
+       (newline port))
+     (let ((status (run-synchronous-subprocess "make" (list "all"))))
+       (if (not (zero? status))
+ 	  (begin
+ 	    (write-string "../tests/ffi/test-ffi.scm:0: Test FFI build failed."
+ 			  (notification-output-port))
+ 	    (error "Test FFI build failed:" status))
  	  (begin
 -	    (fluid-let ((load/suppress-loading-message? #t))
 -	      (load-option 'FFI))
 +	    (load-option 'FFI)
  	    (with-system-library-directories '("./")
  	      (lambda ()
  		(compile-file "test-ffi-wrapper")))