X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Frun-tests.lisp;h=b67497e9d2f4918b3350bb3773ebe2adb806af0d;hb=179de85ab4fdff049c72ddb2767b93d838494b09;hp=20c64b5bfea99639c117191b0deda8c0d38e9151;hpb=9ef5527c3db71fcb3a98b5a37a1006789834ac0a;p=sbcl.git

diff --git a/tests/run-tests.lisp b/tests/run-tests.lisp
index 20c64b5..b67497e 100644
--- a/tests/run-tests.lisp
+++ b/tests/run-tests.lisp
@@ -1,10 +1,9 @@
 #+#.(cl:if (cl:find-package "ASDF") '(or) '(and))
-(load (merge-pathnames "../contrib/asdf/asdf.fasl"))
+(require :asdf)
 
 #+#.(cl:if (cl:find-package "SB-POSIX") '(or) '(and))
-(let ((asdf:*central-registry*
-       (cons "../contrib/systems/" asdf:*central-registry*)))
-  (asdf:oos 'asdf:load-op 'sb-posix))
+(handler-bind (#+win32 (warning #'muffle-warning))
+  (require :sb-posix))
 
 (load "test-util.lisp")
 
@@ -37,14 +36,15 @@
   (impure-runner (impure-cload-files) #'cload-test)
   #-win32 (impure-runner (sh-files) #'sh-test)
   (report)
-  (sb-ext:quit :unix-status (if (unexpected-failures)
-                                1
-                                104)))
+  (sb-ext:exit :code (if (unexpected-failures)
+                         1
+                         104)))
 
 (defun report ()
   (terpri)
   (format t "Finished running tests.~%")
-  (let ((skipcount 0))
+  (let ((skipcount 0)
+        (*print-pretty* nil))
     (cond (*all-failures*
            (format t "Status:~%")
            (dolist (fail (reverse *all-failures*))
@@ -68,6 +68,7 @@
                             (ecase (first fail)
                               (:expected-failure "Expected failure:")
                               (:unexpected-failure "Failure:")
+                              (:leftover-thread "Leftover thread (broken):")
                               (:unexpected-success "Unexpected success:")
                               (:skipped-broken "Skipped (broken):")
                               (:skipped-disabled "Skipped (irrelevant):"))
@@ -146,7 +147,7 @@
           (skip-file ()
             (format t ">>>~a<<<~%" test-util::*failures*)))
         (test-util:report-test-status)
-        (sb-ext:quit :unix-status 104)))))
+        (sb-ext:exit :code 104)))))
 
 (defun impure-runner (files test-fun)
   (format t "// Running impure tests (~a)~%" test-fun)
@@ -211,7 +212,7 @@
                                       :output *error-output*)))
      (let ((*failures* nil))
        (test-util:report-test-status))
-     (sb-ext:quit :unix-status (process-exit-code process))))
+     (sb-ext:exit :code (process-exit-code process))))
 
 (defun accept-test-file (file)
   (if *accept-files*