[Git][cmucl/cmucl][master] Move defsystem for pcl-tests to its own file.

[Raymond Toy]

Raymond Toy pushed to branch master at cmucl / cmucl


Commits:
a368558e by Raymond Toy at 2017-10-08T15:17:59-07:00
Move defsystem for pcl-tests to its own file.

The upgrade to ASDF 3.3.0 broke the pcl-tests; this version doesn't
like having the defsystem in the same file.  Thus, move the defsystem
to its own file and load it up in pcl.lisp (via require).

- - - - -


2 changed files:

- + tests/pcl-tests.asd
- tests/pcl.lisp


Changes:

=====================================
tests/pcl-tests.asd
=====================================
--- /dev/null
+++ b/tests/pcl-tests.asd
@@ -0,0 +1,39 @@
+;;; -*- Mode: lisp -*-
+
+(asdf:defsystem :pcl-tests
+  :pathname "pcl/"
+  :components
+  ((:file "pkg")
+   #+gerds-pcl
+   (:file "ctor"
+    :depends-on ("pkg"))
+   (:file "defclass"
+    :depends-on ("pkg"))
+   (:file "make-instance"
+    :depends-on ("pkg" #+gerds-pcl "ctor"))
+   (:file "reinitialize-instance"
+    :depends-on ("pkg" "make-instance"))
+   (:file "slot-value"
+    :depends-on ("pkg" "make-instance"))
+   (:file "slot-boundp"
+    :depends-on ("pkg" "make-instance"))
+   (:file "slot-missing"
+    :depends-on ("pkg" "make-instance"))
+   (:file "slot-accessors"
+    :depends-on ("pkg" "make-instance"))
+   (:file "slot-type"
+    :depends-on ("pkg" "slot-value"))
+   (:file "inline-access"
+    :depends-on ("pkg" "slot-type"))
+   (:file "method-combination"
+    :depends-on ("pkg"))
+   (:file "pv"
+    :depends-on ("pkg"))
+   (:file "defgeneric"
+    :depends-on ("pkg"))
+   (:file "defmethod"
+    :depends-on ("pkg"))
+   (:file "find-method"
+    :depends-on ("pkg"))
+   (:file "methods"
+    :depends-on ("pkg"))))


=====================================
tests/pcl.lisp
=====================================
--- a/tests/pcl.lisp
+++ b/tests/pcl.lisp
@@ -26,42 +26,11 @@
 		  (merge-pathnames #p"pcl/*.*"
 				   *load-truename*))))
 
-(asdf:defsystem :pcl-test
-  :pathname "pcl/"
-  :components
-  ((:file "pkg")
-   #+gerds-pcl
-   (:file "ctor"
-    :depends-on ("pkg"))
-   (:file "defclass"
-    :depends-on ("pkg"))
-   (:file "make-instance"
-    :depends-on ("pkg" #+gerds-pcl "ctor"))
-   (:file "reinitialize-instance"
-    :depends-on ("pkg" "make-instance"))
-   (:file "slot-value"
-    :depends-on ("pkg" "make-instance"))
-   (:file "slot-boundp"
-    :depends-on ("pkg" "make-instance"))
-   (:file "slot-missing"
-    :depends-on ("pkg" "make-instance"))
-   (:file "slot-accessors"
-    :depends-on ("pkg" "make-instance"))
-   (:file "slot-type"
-    :depends-on ("pkg" "slot-value"))
-   (:file "inline-access"
-    :depends-on ("pkg" "slot-type"))
-   (:file "method-combination"
-    :depends-on ("pkg"))
-   (:file "pv"
-    :depends-on ("pkg"))
-   (:file "defgeneric"
-    :depends-on ("pkg"))
-   (:file "defmethod"
-    :depends-on ("pkg"))
-   (:file "find-method"
-    :depends-on ("pkg"))
-   (:file "methods"
-    :depends-on ("pkg"))))
+;; Just smash it with our path so we don't accidentally look up
+;; pcl-files somewhere else.
+(setf asdf:*central-registry*
+      (list (make-pathname :directory (pathname-directory *load-pathname*))))
 
-(asdf:oos 'asdf:load-op :pcl-test)
+(require :pcl-tests)
+
+(asdf:oos 'asdf:load-op :pcl-tests)



View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/a368558eacabee5d8b099dc07692b56ef5fb427f

---
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/a368558eacabee5d8b099dc07692b56ef5fb427f
You're receiving this email because of your account on gitlab.common-lisp.net.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mailman.common-lisp.net/pipermail/cmucl-cvs/attachments/20180130/dd8e1052/attachment-0001.html>