Changeset 12362 in project


Ignore:
Timestamp:
11/05/08 22:15:54 (13 years ago)
Author:
sjamaan
Message:

Pull up changes in release 3 test

Location:
release/4/test
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • release/4/test

  • release/4/test/test-support.scm

    r11761 r12362  
    8787      ((and (pair? x) (eq? 'let (car x)))
    8888       (if (and (pair? o) (car o))
    89          (truncate-source (car (reverse x)) width #t)
    90          (string-append "..."
    91                         (truncate-source (car (reverse x)) (- width 3) #t))))
     89           (truncate-source (car (reverse x)) width #t)
     90           (string-append "..."
     91                          (truncate-source (car (reverse x)) (- width 3) #t))))
     92      ((and (pair? x) (eq? 'call-with-current-continuation (car x)))
     93       (truncate-source (cons 'call/cc (cdr x)) width (and (pair? o) (car o))))
    9294      (else
    9395       (string-append
     
    111113            (else ""))))
    112114     (if (pair? info)
    113        (set-cdr! info (cons (cons 'gen-name name) (cdr info))))
     115         (set-cdr! info (cons (cons 'gen-name name) (cdr info))))
    114116     name)))
    115117
     
    119121        (name (test-get-name! info)))
    120122    (display name)
     123    (display " ")
    121124    (let ((diff (- width 9 (string-length name))))
    122125      (cond
    123126       ((positive? diff)
    124         (display " ")
    125127        (display (make-string diff #\.)))))
    126128    (display " ")
     
    179181          (let ((res (expr)))
    180182            (let ((status
    181                    (if (if (assq-ref info 'assertion)
    182                            res
    183                            ((current-test-comparator) expect-val res))
     183                   (if (and (not (assq-ref info 'expect-error))
     184                            (if (assq-ref info 'assertion)
     185                                res
     186                                ((current-test-comparator) expect-val res)))
    184187                       'PASS
    185188                       'FAIL))
  • release/4/test/test.scm

    r11907 r12362  
    11;;;; test.scm -- simple friendly test suite
    22;;
    3 ;; Copyright (c) 2007 Alex Shinn. All rights reserved.
     3;; Copyright (c) 2007-2008 Alex Shinn. All rights reserved.
    44;; BSD-style license: http://synthcode.com/license.txt
    55
    66(module test
    7   (test test-assert test-error (test-group test-group-inc! current-test-group)
     7  (test test-error (test-group test-group-inc! current-test-group)
    88   test-begin test-end test-syntax-error test-info
    99   (test-vars test-run) test-exit
     
    3939  (syntax-rules ()
    4040    ((_ expr)
    41      (test-assert #f expr))
     41    (test-assert #f expr))
    4242    ((_ name expr)
    4343     (test-info name #f expr ((assertion . #t))))
  • release/4/test/test.setup

    r11444 r12362  
    55 'test
    66 '("test.so" "test.import.so")
    7  '((version 0.9.1)
     7 '((version 0.9.6)
    88   (documentation "test.html")))
Note: See TracChangeset for help on using the changeset viewer.