From b2a47642713286c195d2e4fd27b67019a0cba411 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 23 Jul 2015 08:06:43 -0700 Subject: Split off test macros from ifa.tl into common file. * Makefile (TESTS_OUT): Don't use find to hunt down tests; but rather wildcard. This way common.tl is not mistakenly identified as an independent test file. * tests/012/ifa.tl: Removed test code, placed in new file which is loaded. * tests/common.tl: New file. --- tests/012/ifa.tl | 15 +-------------- tests/common.tl | 13 +++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 tests/common.tl (limited to 'tests') diff --git a/tests/012/ifa.tl b/tests/012/ifa.tl index ae283abc..64fc6793 100644 --- a/tests/012/ifa.tl +++ b/tests/012/ifa.tl @@ -1,17 +1,4 @@ -(defmacro error-to-sym (expr) - ^(catch ,expr - (error (cond) :error))) - -;; test framework for ifa uses ifa! -(defmacro test (:env env expr expected) - (catch - (let ((expr-expn (macroexpand expr env))) - ^(ifa (not (equal (error-to-sym ,expr-expn) ',expected)) - (error "test case ~s failed: produced ~s; expected ~s" - ',expr it ',expected))) - (error (exc) - (unless (eq expected :error) - (error "test case ~s failed to expand: expected is ~s" expr expected))))) +(load "../common") ;; "it" is (+ 2 2) (test (ifa (> (+ 2 2) 0) (* it 2)) diff --git a/tests/common.tl b/tests/common.tl new file mode 100644 index 00000000..f4ad7351 --- /dev/null +++ b/tests/common.tl @@ -0,0 +1,13 @@ +(defmacro error-to-sym (expr) + ^(catch ,expr + (error (cond) :error))) + +(defmacro test (:env env expr expected) + (catch + (let ((expr-expn (macroexpand expr env))) + ^(ifa (not (equal (error-to-sym ,expr-expn) ',expected)) + (error "test case ~s failed: produced ~s; expected ~s" + ',expr it ',expected))) + (error (exc) + (unless (eq expected :error) + (error "test case ~s failed to expand: expected is ~s" expr expected))))) -- cgit v1.2.3