From: Marco Baringer <mb@bese.it>
Date: Sat, 9 Feb 2013 11:05:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'cl-fiveam/master'
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=b73b69718c49a7e5c666bab225cc0843d7c7aadb;p=fiveam.git

Merge remote-tracking branch 'cl-fiveam/master'

Conflicts:
	src/test.lisp

Update docstring for 5am:test to point to 5am:def-test
---

b73b69718c49a7e5c666bab225cc0843d7c7aadb
diff --cc src/test.lisp
index e874dc8,982c176..b5e590a
--- a/src/test.lisp
+++ b/src/test.lisp
@@@ -40,8 -30,33 +40,7 @@@ named KEY in the *TEST* hash table.
          collect test))
  
  (defmacro test (name &body body)
-   "Deprecated. See DEF-TEST."
-   (simple-style-warning "~A is OBSOLETE! Use ~A instead." 'test 'def-test)
 -  "Create a test named NAME. If NAME is a list it must be of the
 -form:
 -
 -  (name &key depends-on suite fixture compile-at profile)
 -
 -NAME is the symbol which names the test.
 -
 -DEPENDS-ON is a list of the form:
 -
 - (AND . test-names) - This test is run only if all of the tests
 - in TEST-NAMES have passed, otherwise a single test-skipped
 - result is generated.
 -
 - (OR . test-names) - If any of TEST-NAMES has passed this test is
 - run, otherwise a test-skipped result is generated.
 -
 - (NOT test-name) - This is test is run only if TEST-NAME failed.
 -
 -AND, OR and NOT can be combined to produce complex dependencies.
 -
 -If DEPENDS-ON is a symbol it is interpreted as `(AND
 -,depends-on), this is accomadate the common case of one test
 -depending on another.
 -
 -FIXTURE specifies a fixture to wrap the body in.
 -
 -If PROFILE is T profiling information will be collected as well."
++  "Alias for DEF-TEST."
    (destructuring-bind (name &rest args)
        (ensure-list name)
      `(def-test ,name (,@args) ,@body)))