Changeset 13924

Timestamp:

05/04/12 09:14:24 (12 years ago)

Author:

Mark Evenson

Message:

ansi-tests: DO-TESTS-MATCHING will run all case-insensitive matching tests.

An ASDF load of ANSI-INTERPRETED now loads the interpreted tests into
memory via an :around specialization.

Changes in ABCL.TEST.ANSI (aka ANSI-TESTS):

DO-TESTS-MATCHING implemented (cribbed from ABCL-TEST-LISP).

Refactored DEFPACKAGE forms out of ABCL-ANSI-TESTS code, creating
abcl-ansi.lisp to hold all other forms.

Import symbols from REGRESSION-TEST where it makes sense (list could
probably be larger; why not just use the package?)

Location:

trunk/abcl

Files:

• abcl.asd (modified) (2 diffs)
• test/lisp/ansi/abcl-ansi.lisp (added)
• test/lisp/ansi/packages.lisp (moved) (moved from trunk/abcl/test/lisp/ansi/package.lisp) (1 diff)

trunk/abcl/abcl.asd

@@ -67 +67 @@
    (funcall (intern (symbol-name 'run) :abcl.test.lisp)))
 
-;;; Test ABCL with the interpreted ANSI tests
-(defsystem :ansi-interpreted :version "1.1" 
-           :components
-           ((:module ansi-tests :pathname "test/lisp/ansi/" :components
-         ((:file "package")
-                (:file "parse-ansi-errors" :depends-on ("package"))))))
+(defsystem :ansi-interpreted 
+  :version "1.2" 
+  :description "Test ABCL with the interpreted ANSI tests" :components 
+  ((:module ansi-tests :pathname "test/lisp/ansi/" :components
+            ((:file "packages")
+             (:file "abcl-ansi" :depends-on ("packages"))
+             (:file "parse-ansi-errors" :depends-on ("abcl-ansi"))))))
 (defmethod perform :before ((o test-op) (c (eql (find-system :ansi-interpreted))))
   (load-system  :ansi-interpreted))
+
+(defmethod perform :after ((o load-op) (c (eql (find-system :ansi-interpreted))))
+  (funcall (intern (symbol-name 'load-tests) :abcl.test.ansi)))
+
 (defmethod perform ((o test-op) (c (eql (find-system :ansi-interpreted))))
   (funcall (intern (symbol-name 'run) :abcl.test.ansi)
      :compile-tests nil))
 
-;;; Test ABCL with the compiled ANSI tests
-(defsystem :ansi-compiled :version "1.1" 
-           :components
+
+(defsystem :ansi-compiled :version "1.2" 
+           :description "Test ABCL with the compiled ANSI tests." :components 
            ((:module ansi-tests :pathname "test/lisp/ansi/" :components
-         ((:file "package")
-                (:file "parse-ansi-errors" :depends-on ("package"))))))
+                     ((:file "packages")
+                      (:file "abcl-ansi" :depends-on ("packages"))
+                      (:file "parse-ansi-errors" :depends-on ("abcl-ansi"))))))
+
 (defmethod perform :before ((o test-op) (c (eql (find-system :ansi-compiled))))
   (load-system :ansi-compiled))
@@ -91 +98 @@
      :compile-tests t))
 
-;;; Test ABCL with CL-BENCH 
-(defsystem :cl-bench :components
-           ((:module cl-bench-package :pathname "../cl-bench/"
-                    :components ((:file "defpackage")))
-            (:module cl-bench-wrapper :pathname "test/lisp/cl-bench/" 
-                     :depends-on (cl-bench-package) :components
-                     ((:file "wrapper")))))
+(defsystem :cl-bench 
+  :description "Test ABCL with CL-BENCH."
+  :components ((:module cl-bench-package :pathname "../cl-bench/"
+                        :components ((:file "defpackage")))
+               (:module cl-bench-wrapper :pathname "test/lisp/cl-bench/" 
+                        :depends-on (cl-bench-package) :components
+                        ((:file "wrapper")))))
 (defmethod perform :before ((o test-op) (c (eql (find-system :cl-bench))))
   (load-system :cl-bench))

trunk/abcl/test/lisp/ansi/packages.lisp

@@ -3 +3 @@
   (:nicknames #:ansi-tests #:abcl-ansi-tests #:gcl-ansi)
   (:export #:run 
-     #:verify-ansi-tests
+           #:verify-ansi-tests
      #:load-tests
      #:clean-tests
            #:full-report
-     #:report #:parse))
+     #:report #:parse)
+  (:import-from #:rt #:do-test #:do-test #:do-tests))
 
-(in-package :abcl.test.ansi)
 
-(defparameter *ansi-tests-master-source-location*
-  "<svn://common-lisp.net/project/ansi-test/svn/trunk/ansi-tests>")  
-
-(defparameter *ansi-tests-directory*
-  (if (find :asdf2 *features*)
-      (asdf:system-relative-pathname :ansi-compiled "../ansi-tests/")
-      (merge-pathnames #p"../ansi-tests/"
-           (asdf:component-pathname 
-      (asdf:find-system :ansi-compiled)))))
-
-(defun run (&key (compile-tests nil)) 
-  "Run the ANSI-TESTS suite, to be found in *ANSI-TESTS-DIRECTORY*.
-Possibly running the compiled version of the tests if COMPILE-TESTS is non-NIL."
-  (verify-ansi-tests)
-  (let* ((ansi-tests-directory 
-    *ansi-tests-directory*)
-   (boot-file 
-    (if compile-tests "compileit.lsp" "doit.lsp"))
-   (message 
-    (format nil "Invocation of '~A' in ~A" 
-      boot-file ansi-tests-directory)))
-    (progv 
-  '(*default-pathname-defaults*) 
-  `(,(merge-pathnames *ansi-tests-directory* 
-          *default-pathname-defaults*))
-    (format t "--->  ~A begins.~%" message)
-    (format t "Invoking ABCL hosted on ~A ~A.~%" 
-      (software-type) (software-version))
-    (time (load boot-file))
-    (format t "<--- ~A ends.~%" message))))
-
-(defun verify-ansi-tests () 
-  (unless 
-      (probe-file *ansi-tests-directory*)
-    (error 'file-error
-     "Failed to find the GCL ANSI tests in '~A'. Please
-locally obtain ~A, and set the value of *ANSI-TESTS-DIRECTORY* to that
-location."  
-       *ansi-tests-directory*
-       *ansi-tests-master-source-location*)))
-
-(defvar *ansi-tests-loaded-p* nil)
-(defun load-tests ()
-  "Load the ANSI tests but do not execute them."
-  (verify-ansi-tests)
-  (let ((*default-pathname-defaults* *ansi-tests-directory*)
-  (package *package*))
-    (setf *package* (find-package :cl-user))
-    (load "gclload1.lsp")
-    (load "gclload2.lsp")
-    (setf *package* package))
-  (setf *ansi-tests-loaded-p* t))
-  
-(defun clean-tests ()
-  "Do what 'make clean' would do from the GCL ANSI tests,"
-  ;; so we don't have to hunt for 'make' in the PATH on win32.
-  (verify-ansi-tests)
-
-  (mapcar #'delete-file
-    (append (directory (format nil "~A/*.cls" *ansi-tests-directory*))
-      (directory (format nil "~A/*.abcl" *ansi-tests-directory*))
-      (directory (format nil "~A/scratch/*" *ansi-tests-directory*))
-      (mapcar (lambda(x) 
-          (format nil "~A/~A" *ansi-tests-directory* x))
-        '("scratch/"
-          "scratch.txt" "foo.txt" "foo.lsp"
-          "foo.dat" 
-          "tmp.txt" "tmp.dat" "tmp2.dat"
-          "temp.dat" "out.class" 
-          "file-that-was-renamed.txt"
-          "compile-file-test-lp.lsp"
-          "compile-file-test-lp.out" 
-          "ldtest.lsp")))))