Changeset 12193 in project


Ignore:
Timestamp:
10/18/08 16:50:28 (12 years ago)
Author:
Alex Shinn
Message:

Fixing silly bug in test-error.

Location:
release/3/test
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • release/3/test/test-support.scm

    r11559 r12193  
    105105      ((and (pair? x) (eq? 'let (car x)))
    106106       (if (and (pair? o) (car o))
    107          (truncate-source (car (reverse x)) width #t)
    108          (string-append "..."
    109                         (truncate-source (car (reverse x)) (- width 3) #t))))
     107           (truncate-source (car (reverse x)) width #t)
     108           (string-append "..."
     109                          (truncate-source (car (reverse x)) (- width 3) #t))))
     110      ((and (pair? x) (eq? 'call-with-current-continuation (car x)))
     111       (truncate-source (cons 'call/cc (cdr x)) width (and (pair? o) (car o))))
    110112      (else
    111113       (string-append
     
    129131            (else ""))))
    130132     (if (pair? info)
    131        (set-cdr! info (cons (cons 'gen-name name) (cdr info))))
     133         (set-cdr! info (cons (cons 'gen-name name) (cdr info))))
    132134     name)))
    133135
     
    137139        (name (test-get-name! info)))
    138140    (display name)
     141    (display " ")
    139142    (let ((diff (- width 9 (string-length name))))
    140143      (cond
    141144       ((positive? diff)
    142         (display " ")
    143145        (display (make-string diff #\.)))))
    144146    (display " ")
     
    197199          (let ((res (expr)))
    198200            (let ((status
    199                    (if (if (assq-ref info 'assertion)
    200                            res
    201                            ((current-test-comparator) expect-val res))
     201                   (if (and (not (assq-ref info 'expect-error))
     202                            (if (assq-ref info 'assertion)
     203                                res
     204                                ((current-test-comparator) expect-val res)))
    202205                       'PASS
    203206                       'FAIL))
  • release/3/test/test.scm

    r11937 r12193  
    2626         (test name (expect ...) expr)))
    2727       ((test name expect expr)
    28         (test-info name expect expr))
     28        (test-info name expect expr ()))
    2929       ((test a ...)
    3030        (test-syntax-error 'test "2 or 3 arguments required"
  • release/3/test/test.setup

    r11770 r12193  
    66 '((syntax)
    77  (require-at-runtime test-support)
    8   (version 0.9.5)))
     8  (version 0.9.6)))
Note: See TracChangeset for help on using the changeset viewer.