summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2021-06-11 07:25:27 -0700
committerKaz Kylheku <kaz@kylheku.com>2021-06-11 07:25:27 -0700
commitf6e56f2b6475a44dca8233e821dd802cde7bb8c7 (patch)
tree923d35903a8daa8b8bddfa1913ee6675e9652712
parentfe4652d2925bd7a2296a6c527c49bd047f78febc (diff)
downloadtxr-f6e56f2b6475a44dca8233e821dd802cde7bb8c7.tar.gz
txr-f6e56f2b6475a44dca8233e821dd802cde7bb8c7.tar.bz2
txr-f6e56f2b6475a44dca8233e821dd802cde7bb8c7.zip
tests: remove *stderr* to *stdnull* redirection.
The recent commit 225ff2fa2fdb9e5169db5e2c06dc3b0053b775bb titled "errors: avoid premature release of deferred warnings." obviates the need for dealing with noise when detecting errors from test cases. * patmatch.tl: Remove macro-time-let around several test cases. * tests/012/ifa.tl: Likewise. * tests/common.tl (macro-time-let): Macro removed.
-rw-r--r--tests/011/patmatch.tl14
-rw-r--r--tests/012/ifa.tl3
-rw-r--r--tests/common.tl7
3 files changed, 7 insertions, 17 deletions
diff --git a/tests/011/patmatch.tl b/tests/011/patmatch.tl
index 9e566502..aea891c3 100644
--- a/tests/011/patmatch.tl
+++ b/tests/011/patmatch.tl
@@ -357,12 +357,11 @@
(when-match `abc` "abc" t) t
(when-match `@a` "abc" a) "abc")
-(macro-time-let ((*stderr* *stdnull*))
- (mtest
- (when-match `@a@b` "abc" a) :error
- (when-match `@nil@b` "abc" a) :error
- (when-match `@nil@nil` "abc" a) :error
- (when-match `@a@nil` "abc" a) :error))
+(mtest
+ (when-match `@a@b` "abc" a) :error
+ (when-match `@nil@b` "abc" a) :error
+ (when-match `@nil@nil` "abc" a) :error
+ (when-match `@a@nil` "abc" a) :error)
(mtest
(when-match `@a-$` "a-$" a) "a"
@@ -394,8 +393,7 @@
(when-match `@z#@{a 2}` "0#abb" a) nil
(when-match `@z#@{a 4}` "0#abb" a) nil))
-(macro-time-let ((*stderr* *stdnull*))
- (test (when-match `#@{a 4 5}` "#abb" a) :error))
+(test (when-match `#@{a 4 5}` "#abb" a) :error)
(let ((b "bcd"))
(mtest
diff --git a/tests/012/ifa.tl b/tests/012/ifa.tl
index 05b47ab3..45a2939b 100644
--- a/tests/012/ifa.tl
+++ b/tests/012/ifa.tl
@@ -14,8 +14,7 @@
(test (let ((x 1) (y 0)) (ifa (> x y) it)) 1)
;; multiple it-candidates: error
-(macro-time-let ((*stderr* *stdnull*))
- (test (let (x y) (ifa (> (* x x) (* y y)) it)) :error))
+(test (let (x y) (ifa (> (* x x) (* y y)) it)) :error)
;; "it" is (+ 3 (* 2 x))
(test (let ((x 5))
diff --git a/tests/common.tl b/tests/common.tl
index 82cefd48..4011583f 100644
--- a/tests/common.tl
+++ b/tests/common.tl
@@ -57,13 +57,6 @@
((:cygwin :cygnal) (dlopen "cygwin1.dll"))
(t (dlopen nil))))
-(defmacro macro-time-let (:env env bindings . body)
- (with-gensyms (invoke)
- ^(macrolet ((,invoke ()
- (let ,bindings
- (expand '(progn ,*body) ,env))))
- (,invoke))))
-
(defmacro with-temp-file ((name-var stream-var prefix) . body)
^(let* ((,stream-var (mkstemp ,prefix))
(,name-var (stream-get-prop ,stream-var :name)))