Rework test infrastructure to keep track of tests which are disabled

[sbcl.git] / tests / deadline.impure.lisp

diff --git a/tests/deadline.impure.lisp b/tests/deadline.impure.lisp
index e4b077e..88171e0 100644 (file)
--- a/tests/deadline.impure.lisp
+++ b/tests/deadline.impure.lisp
@@ -65,55 +65,52 @@
     (assert (= n 1))
     (assert (not final))))
 
-#+(and sb-thread (not sb-lutex))
-(progn
-
-  (with-test (:name (:deadline :get-mutex))
-    (assert-timeout
-     (let ((lock (sb-thread:make-mutex))
-           (waitp t))
-       (sb-thread:make-thread (lambda ()
-                                (sb-thread:get-mutex lock)
-                                (setf waitp nil)
-                                (sleep 5)))
-       (loop while waitp do (sleep 0.01))
-       (sb-sys:with-deadline (:seconds 1)
-         (sb-thread:get-mutex lock)))))
-
-  (with-test (:name (:deadline :wait-on-semaphore))
-    (assert-timeout
-     (let ((sem (sb-thread::make-semaphore :count 0)))
-       (sb-sys:with-deadline (:seconds 1)
-         (sb-thread::wait-on-semaphore sem)))))
+(with-test (:name (:deadline :get-mutex) :skipped-on '(not (and :sb-thread (not :sb-lutex))))
+  (assert-timeout
+   (let ((lock (sb-thread:make-mutex))
+        (waitp t))
+     (sb-thread:make-thread (lambda ()
+                             (sb-thread:get-mutex lock)
+                             (setf waitp nil)
+                             (sleep 5)))
+     (loop while waitp do (sleep 0.01))
+     (sb-sys:with-deadline (:seconds 1)
+       (sb-thread:get-mutex lock)))))
 
-  (with-test (:name (:deadline :join-thread))
-    (assert-timeout
+(with-test (:name (:deadline :wait-on-semaphore) :skipped-on '(not (and :sb-thread (not :sb-lutex))))
+  (assert-timeout
+   (let ((sem (sb-thread::make-semaphore :count 0)))
      (sb-sys:with-deadline (:seconds 1)
-       (sb-thread:join-thread
-        (sb-thread:make-thread (lambda () (loop (sleep 1))))))))
+       (sb-thread::wait-on-semaphore sem)))))
+
+(with-test (:name (:deadline :join-thread) :skipped-on '(not (and :sb-thread (not :sb-lutex))))
+  (assert-timeout
+   (sb-sys:with-deadline (:seconds 1)
+     (sb-thread:join-thread
+      (sb-thread:make-thread (lambda () (loop (sleep 1))))))))
 
-  (with-test (:name (:deadline :futex-wait-eintr))
-    (let ((lock (sb-thread:make-mutex))
-          (waitp t))
-      (sb-thread:make-thread (lambda ()
-                               (sb-thread:get-mutex lock)
-                               (setf waitp nil)
-                               (sleep 5)))
-      (loop while waitp do (sleep 0.01))
-      (let ((thread (sb-thread:make-thread
-                     (lambda ()
-                       (let ((start (get-internal-real-time)))
-                         (handler-case
-                             (sb-sys:with-deadline (:seconds 1)
-                               (sb-thread:get-mutex lock))
-                           (sb-sys:deadline-timeout (x)
-                             (declare (ignore x))
-                             (let ((end (get-internal-real-time)))
-                               (float (/ (- end start)
-                                         internal-time-units-per-second)
-                                      0.0)))))))))
-        (sleep 0.3)
-        (sb-thread:interrupt-thread thread (lambda () 42))
-        (let ((seconds-passed (sb-thread:join-thread thread)))
-          (format t "Deadline in ~S~%" seconds-passed)
-          (assert (< seconds-passed 1.2)))))))
\ No newline at end of file
+(with-test (:name (:deadline :futex-wait-eintr) :skipped-on '(not (and :sb-thread (not :sb-lutex))))
+  (let ((lock (sb-thread:make-mutex))
+       (waitp t))
+    (sb-thread:make-thread (lambda ()
+                            (sb-thread:get-mutex lock)
+                            (setf waitp nil)
+                            (sleep 5)))
+    (loop while waitp do (sleep 0.01))
+    (let ((thread (sb-thread:make-thread
+                  (lambda ()
+                    (let ((start (get-internal-real-time)))
+                      (handler-case
+                          (sb-sys:with-deadline (:seconds 1)
+                            (sb-thread:get-mutex lock))
+                        (sb-sys:deadline-timeout (x)
+                          (declare (ignore x))
+                          (let ((end (get-internal-real-time)))
+                            (float (/ (- end start)
+                                      internal-time-units-per-second)
+                                   0.0)))))))))
+      (sleep 0.3)
+      (sb-thread:interrupt-thread thread (lambda () 42))
+      (let ((seconds-passed (sb-thread:join-thread thread)))
+       (format t "Deadline in ~S~%" seconds-passed)
+       (assert (< seconds-passed 1.2))))))