From 08b56769f9480ed61c27d474dbcafa4410d519dd Mon Sep 17 00:00:00 2001 From: Jan Moringen Date: Sun, 6 Mar 2016 15:29:21 +0100 Subject: [PATCH] tests: WITH-TEST and CHECKED-COMPILE in interface.[im]pure.lisp --- tests/interface.impure.lisp | 81 +++++++++++++++------------- tests/interface.pure.lisp | 129 +++++++++++++++++++++++++------------------- 2 files changed, 119 insertions(+), 91 deletions(-) diff --git a/tests/interface.impure.lisp b/tests/interface.impure.lisp index 8a39efa60..79a9ddaf5 100644 --- a/tests/interface.impure.lisp +++ b/tests/interface.impure.lisp @@ -90,9 +90,13 @@ (let ((sb-ext:*evaluator-mode* :compile)) (eval `(let (x) (defun closure-to-describe () (incf x))))) -(with-test (:name :describe-empty-gf) - (silently (describe (make-instance 'generic-function))) - (silently (describe (make-instance 'standard-generic-function)))) +(with-test (:name (describe :empty-gf)) + (assert-no-signal + (silently (describe (make-instance 'generic-function))) + warning) + (assert-signal + (silently (describe (make-instance 'standard-generic-function))) + warning)) ;;; DESCRIBE should run without signalling an error. (with-test (:name (describe :no-error)) @@ -109,35 +113,36 @@ ;;; The DESCRIBE-OBJECT methods for built-in CL stuff should do ;;; FRESH-LINE and TERPRI neatly. -(dolist (i (list (make-to-be-described :a 14) 12 "a string" - #0a0 #(1 2 3) #2a((1 2) (3 4)) 'sym :keyword - (find-package :keyword) (list 1 2 3) - nil (cons 1 2) (make-hash-table) - (let ((h (make-hash-table))) - (setf (gethash 10 h) 100 - (gethash 11 h) 121) - h) - (make-condition 'simple-error) - (make-condition 'simple-error :format-control "fc") - #'car #'make-to-be-described (lambda (x) (+ x 11)) - (constantly 'foo) #'(setf to-be-described-a) - #'describe-object (find-class 'to-be-described) - (find-class 'forward-describe-class) - (find-class 'forward-describe-ref) (find-class 'cons))) - (let ((s (with-output-to-string (s) - (write-char #\x s) - (describe i s)))) - (macrolet ((check (form) - `(or ,form - (error "misbehavior in DESCRIBE of ~S:~% ~S" i ',form)))) - (check (char= #\x (char s 0))) - ;; one leading #\NEWLINE from FRESH-LINE or the like, no more - (check (char= #\newline (char s 1))) - (check (char/= #\newline (char s 2))) - ;; one trailing #\NEWLINE from TERPRI or the like, no more - (let ((n (length s))) - (check (char= #\newline (char s (- n 1)))) - (check (char/= #\newline (char s (- n 2)))))))) +(with-test (:name (describe fresh-line terpri)) + (dolist (i (list (make-to-be-described :a 14) 12 "a string" + #0a0 #(1 2 3) #2a((1 2) (3 4)) 'sym :keyword + (find-package :keyword) (list 1 2 3) + nil (cons 1 2) (make-hash-table) + (let ((h (make-hash-table))) + (setf (gethash 10 h) 100 + (gethash 11 h) 121) + h) + (make-condition 'simple-error) + (make-condition 'simple-error :format-control "fc") + #'car #'make-to-be-described (lambda (x) (+ x 11)) + (constantly 'foo) #'(setf to-be-described-a) + #'describe-object (find-class 'to-be-described) + (find-class 'forward-describe-class) + (find-class 'forward-describe-ref) (find-class 'cons))) + (let ((s (with-output-to-string (s) + (write-char #\x s) + (describe i s)))) + (macrolet ((check (form) + `(or ,form + (error "misbehavior in DESCRIBE of ~S:~% ~S" i ',form)))) + (check (char= #\x (char s 0))) + ;; one leading #\NEWLINE from FRESH-LINE or the like, no more + (check (char= #\newline (char s 1))) + (check (char/= #\newline (char s 2))) + ;; one trailing #\NEWLINE from TERPRI or the like, no more + (let ((n (length s))) + (check (char= #\newline (char s (- n 1)))) + (check (char/= #\newline (char s (- n 2))))))))) ;;; Tests of documentation on types and classes @@ -400,11 +405,15 @@ (declare (ignore x)) nil)))) -(with-test (:name :describe-generic-function-with-assumed-type) +(with-test (:name (describe generic-function :assumed-type)) ;; Signalled an error at one point - (flet ((zoo () (gogo))) - (defmethod gogo () nil) - (silently (describe 'gogo)))) + (let ((fun (checked-compile '(lambda () + (flet ((zoo () (gogo))) + (defmethod gogo () nil) + (describe 'gogo))) + :allow-style-warnings t))) + (handler-bind ((warning #'muffle-warning)) ; implicit gf + (silently (funcall fun))))) (defmacro bug-643958-test () "foo" diff --git a/tests/interface.pure.lisp b/tests/interface.pure.lisp index 13a0c2c9e..cfd6e8de5 100644 --- a/tests/interface.pure.lisp +++ b/tests/interface.pure.lisp @@ -28,36 +28,49 @@ ;;; APROPOS should accept a package designator, not just a package, and ;;; furthermore do the right thing when it gets a package designator. ;;; (bug reported and fixed by Alexey Dejneka sbcl-devel 2001-10-17) -(assert (< 0 - (length (apropos-list "PRINT" :cl)) - (length (apropos-list "PRINT")))) +(with-test (:name (apropos-list :package-designator)) + (assert (< 0 + (length (apropos-list "PRINT" :cl)) + (length (apropos-list "PRINT"))))) ;;; Further, it should correctly deal with the external-only flag (bug ;;; reported by cliini on #lisp IRC 2003-05-30, fixed in sbcl-0.8.0.1x ;;; by CSR) -(assert (= (length (apropos-list "" "CL")) - (length (apropos-list "" "CL" t)))) -(assert (< 0 - (length (apropos-list "" "SB-VM" t)) - (length (apropos-list "" "SB-VM")))) +(with-test (:name (apropos-list :external-only)) + (assert (= (length (apropos-list "" "CL")) + (length (apropos-list "" "CL" t)))) + (assert (< 0 + (length (apropos-list "" "SB-VM" t)) + (length (apropos-list "" "SB-VM"))))) ;;; DESCRIBE shouldn't fail on rank-0 arrays (bug reported and fixed ;;; by Lutz Euler sbcl-devel 2002-12-03) -(describe #0a0) -(describe #(1 2 3)) -(describe #2a((1 2) (3 4))) +(with-test (:name (describe array :rank 0)) + (flet ((test (array) + (assert (plusp (length (with-output-to-string (stream) + (describe array stream))))))) + (test #0a0) + (test #(1 2 3)) + (test #2a((1 2) (3 4))))) ;;; TYPEP, SUBTYPEP, UPGRADED-ARRAY-ELEMENT-TYPE and ;;; UPGRADED-COMPLEX-PART-TYPE should be able to deal with NIL as an ;;; environment argument -(typep 1 'fixnum nil) -(subtypep 'fixnum 'integer nil) -(upgraded-array-element-type '(mod 5) nil) -(upgraded-complex-part-type '(single-float 0.0 1.0) nil) +(with-test (:name (typep :environment nil)) + (typep 1 'fixnum nil)) + +(with-test (:name (subtypep :environment nil)) + (subtypep 'fixnum 'integer nil)) + +(with-test (:name (upgraded-array-element-type :environment nil)) + (upgraded-array-element-type '(mod 5) nil)) + +(with-test (:name (upgraded-complex-part-type :environment nil)) + (upgraded-complex-part-type '(single-float 0.0 1.0) nil)) #+sb-doc -(with-test (:name :sb-ext-documentation) - ;;; We should have documentation for our extension package: - (assert (documentation (find-package "SB-EXT") t))) +(with-test (:name (documentation :sb-ext)) + ;; We should have documentation for our extension package: + (assert (documentation (find-package "SB-EXT") t))) ;; This is trying to assert that you didn't mistakenly write ;; "#!+sb-doc (important-form)" in source code @@ -71,7 +84,7 @@ ;; if desired. This would eliminate >1100 reader conditionals, ;; comprising nearly 68% of all reader conditionals in SBCL source. #+sb-doc -(with-test (:name :cl-documentation) +(with-test (:name (documentation :cl)) (let ((n 0)) (do-symbols (s 'cl) (if (fboundp s) @@ -80,10 +93,11 @@ (assert (= n 605)))) ;;; DECLARE should not be a special operator -(assert (not (special-operator-p 'declare))) +(with-test (:name (declare :not special-operator-p)) + (assert (not (special-operator-p 'declare)))) ;;; WITH-TIMEOUT should accept more than one form in its body. -(with-test (:name :with-timeout-forms) +(with-test (:name (sb-ext:with-timeout :forms)) (handler-bind ((sb-ext:timeout #'continue)) (sb-ext:with-timeout 3 (sleep 2) @@ -104,7 +118,7 @@ ;;; Changes to make SLEEP cons less led to SLEEP ;;; not sleeping at all on 32-bit platforms when ;;; (> (mod seconds 1) (* most-positive-fixnum 1e-9)). -(with-test (:name :bug-1194673) +(with-test (:name (sleep :bug-1194673)) (assert (eq :timeout (handler-case (with-timeout 0.01 @@ -131,47 +145,52 @@ (test 'foo 'structure))) ;;; DECODE-UNIVERSAL-TIME should accept second-resolution time-zones. -(macrolet ((test (ut time-zone list) - (destructuring-bind (sec min hr date mon yr day tz) - list - `(multiple-value-bind (sec min hr date mon yr day dst tz) - (decode-universal-time ,ut ,time-zone) - (declare (ignore dst)) - (assert (= sec ,sec)) - (assert (= min ,min)) - (assert (= hr ,hr)) - (assert (= date ,date)) - (assert (= mon ,mon)) - (assert (= yr ,yr)) - (assert (= day ,day)) - (assert (= tz ,tz)))))) - (test (* 86400 365) -1/3600 (1 0 0 1 1 1901 1 -1/3600)) - (test (* 86400 365) 0 (0 0 0 1 1 1901 1 0)) - (test (* 86400 365) 1/3600 (59 59 23 31 12 1900 0 1/3600))) +(with-test (:name (decode-universal-time :second-resolution :time-zone)) + (macrolet ((test (ut time-zone list) + (destructuring-bind (sec min hr date mon yr day tz) + list + `(multiple-value-bind (sec min hr date mon yr day dst tz) + (decode-universal-time ,ut ,time-zone) + (declare (ignore dst)) + (assert (= sec ,sec)) + (assert (= min ,min)) + (assert (= hr ,hr)) + (assert (= date ,date)) + (assert (= mon ,mon)) + (assert (= yr ,yr)) + (assert (= day ,day)) + (assert (= tz ,tz)))))) + (test (* 86400 365) -1/3600 (1 0 0 1 1 1901 1 -1/3600)) + (test (* 86400 365) 0 (0 0 0 1 1 1901 1 0)) + (test (* 86400 365) 1/3600 (59 59 23 31 12 1900 0 1/3600)))) ;;; DECODE-UNIVERSAL-TIME shouldn't fail when the time is outside UNIX ;;; 32-bit time_t and a timezone wasn't passed -(decode-universal-time 0 nil) +(with-test (:name (decode-universal-time :decode 0)) + (decode-universal-time 0 nil)) ;;; ENCODE-UNIVERSAL-TIME should be able to encode the universal time ;;; 0 when passed a representation in a timezone where the ;;; representation of 0 as a decoded time is in 1899. -(encode-universal-time 0 0 23 31 12 1899 1) +(with-test (:name (encode-universal-time :encode 0)) + (encode-universal-time 0 0 23 31 12 1899 1)) ;;; DISASSEMBLE shouldn't fail on purified functions -(disassemble 'cl:+ :stream (make-broadcast-stream)) -(disassemble 'sb-ext:run-program :stream (make-broadcast-stream)) +(with-test (:name (disassemble :purified)) + (disassemble 'cl:+ :stream (make-broadcast-stream)) + (disassemble 'sb-ext:run-program :stream (make-broadcast-stream))) ;;; minimal test of GC: see stress-gc.{sh,lisp} for a more ;;; comprehensive test. -(loop repeat 2 - do (compile nil '(lambda (x) x)) - do (sb-ext:gc :full t)) +(with-test (:name (sb-ext:gc :minimal :stress)) + (loop repeat 2 + do (compile nil '(lambda (x) x)) + do (sb-ext:gc :full t))) ;;; On x86-64, the instruction definitions for CMP*[PS][SD] were broken ;;; so that the disassembler threw an error when they were used with ;;; one operand in memory. -(with-test (:name :bug-814702) +(with-test (:name (disassemble :bug-814702)) ;; Quote the lambdas, because WITH-TEST produces a hairy lexical environment ;; which make an interpreted lambda uncompilable. (disassemble '(lambda (x) @@ -186,7 +205,7 @@ #+x86-64 ;; The labeler for LEA would choke on an illegal encoding ;; instead of showing what it illegally encodes, such as LEA RAX, RSP -(with-test (:name :x86-lea-disassemble-illegal-op) +(with-test (:name (disassemble :x86-lea :illegal-op)) (let ((a (coerce '(#x48 #x8D #xC4) '(array (unsigned-byte 8) (3))))) (sb-sys:with-pinned-objects (a) (sb-disassem::disassemble-memory (sb-sys:sap-int (sb-sys:vector-sap a)) 3 @@ -194,7 +213,7 @@ ;; Assert that disassemblies of identically-acting functions are identical ;; if address printing is turned off. Should work on any backend, I think. -(with-test (:name :disassemble-without-addresses) +(with-test (:name (disassemble :without-addresses)) (flet ((disassembly-text (lambda-expr) (let ((string (let ((sb-disassem::*disassem-location-column-width* 0) @@ -226,10 +245,10 @@ ;;; Check that SLEEP called with ratios (with no common factors with ;;; 1000000000, and smaller than 1/1000000000) works more or less as ;;; expected. -(with-test (:name :sleep-ratios) - (let ((fun0a (compile nil '(lambda () (sleep 1/7)))) - (fun0b (compile nil '(lambda () (sleep 1/100000000000000000000000000)))) - (fun1 (compile nil '(lambda (x) (sleep x)))) +(with-test (:name (sleep ratio)) + (let ((fun0a (checked-compile '(lambda () (sleep 1/7)))) + (fun0b (checked-compile '(lambda () (sleep 1/100000000000000000000000000)))) + (fun1 (checked-compile '(lambda (x) (sleep x)))) (start-time (get-universal-time))) (sleep 1/7) (sleep 1/100000000000000000000000000) @@ -239,10 +258,10 @@ (funcall fun1 1/100000000000000000000000000) (assert (< (- (get-universal-time) start-time) 2)))) -(with-test (:name :version-assert-ok) +(with-test (:name (sb-ext:assert-version->= :ok)) (sb-ext:assert-version->= 1 1 13)) -(with-test (:name :version-assert-fails) +(with-test (:name (sb-ext:assert-version->= :fails)) (assert-error (sb-ext:assert-version->= most-positive-fixnum))) -- 2.11.4.GIT