Merge branch 'master' into Gtk.

diff --cc tests/ffi/test-ffi.scm
index 22214c2a58069d8d298e1f5809afa4270984ad8a,52c6b81ddca5dcda355408e30bbcd1a6416cfd8f..5454d67165527290f2e2873a4c2f7ee44c346413
--- 1/tests/ffi/test-ffi.scm
--- 2/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")))