Raymond Toy pushed to branch master at cmucl / cmucl

Commits:

2 changed files:

Changes:

  • tests/pcl-tests.asd
    1
    +;;; -*- Mode: lisp -*-
    
    2
    +
    
    3
    +(asdf:defsystem :pcl-tests
    
    4
    +  :pathname "pcl/"
    
    5
    +  :components
    
    6
    +  ((:file "pkg")
    
    7
    +   #+gerds-pcl
    
    8
    +   (:file "ctor"
    
    9
    +    :depends-on ("pkg"))
    
    10
    +   (:file "defclass"
    
    11
    +    :depends-on ("pkg"))
    
    12
    +   (:file "make-instance"
    
    13
    +    :depends-on ("pkg" #+gerds-pcl "ctor"))
    
    14
    +   (:file "reinitialize-instance"
    
    15
    +    :depends-on ("pkg" "make-instance"))
    
    16
    +   (:file "slot-value"
    
    17
    +    :depends-on ("pkg" "make-instance"))
    
    18
    +   (:file "slot-boundp"
    
    19
    +    :depends-on ("pkg" "make-instance"))
    
    20
    +   (:file "slot-missing"
    
    21
    +    :depends-on ("pkg" "make-instance"))
    
    22
    +   (:file "slot-accessors"
    
    23
    +    :depends-on ("pkg" "make-instance"))
    
    24
    +   (:file "slot-type"
    
    25
    +    :depends-on ("pkg" "slot-value"))
    
    26
    +   (:file "inline-access"
    
    27
    +    :depends-on ("pkg" "slot-type"))
    
    28
    +   (:file "method-combination"
    
    29
    +    :depends-on ("pkg"))
    
    30
    +   (:file "pv"
    
    31
    +    :depends-on ("pkg"))
    
    32
    +   (:file "defgeneric"
    
    33
    +    :depends-on ("pkg"))
    
    34
    +   (:file "defmethod"
    
    35
    +    :depends-on ("pkg"))
    
    36
    +   (:file "find-method"
    
    37
    +    :depends-on ("pkg"))
    
    38
    +   (:file "methods"
    
    39
    +    :depends-on ("pkg"))))

  • tests/pcl.lisp
    ... ... @@ -26,42 +26,11 @@
    26 26
     		  (merge-pathnames #p"pcl/*.*"
    
    27 27
     				   *load-truename*))))
    
    28 28
     
    
    29
    -(asdf:defsystem :pcl-test
    
    30
    -  :pathname "pcl/"
    
    31
    -  :components
    
    32
    -  ((:file "pkg")
    
    33
    -   #+gerds-pcl
    
    34
    -   (:file "ctor"
    
    35
    -    :depends-on ("pkg"))
    
    36
    -   (:file "defclass"
    
    37
    -    :depends-on ("pkg"))
    
    38
    -   (:file "make-instance"
    
    39
    -    :depends-on ("pkg" #+gerds-pcl "ctor"))
    
    40
    -   (:file "reinitialize-instance"
    
    41
    -    :depends-on ("pkg" "make-instance"))
    
    42
    -   (:file "slot-value"
    
    43
    -    :depends-on ("pkg" "make-instance"))
    
    44
    -   (:file "slot-boundp"
    
    45
    -    :depends-on ("pkg" "make-instance"))
    
    46
    -   (:file "slot-missing"
    
    47
    -    :depends-on ("pkg" "make-instance"))
    
    48
    -   (:file "slot-accessors"
    
    49
    -    :depends-on ("pkg" "make-instance"))
    
    50
    -   (:file "slot-type"
    
    51
    -    :depends-on ("pkg" "slot-value"))
    
    52
    -   (:file "inline-access"
    
    53
    -    :depends-on ("pkg" "slot-type"))
    
    54
    -   (:file "method-combination"
    
    55
    -    :depends-on ("pkg"))
    
    56
    -   (:file "pv"
    
    57
    -    :depends-on ("pkg"))
    
    58
    -   (:file "defgeneric"
    
    59
    -    :depends-on ("pkg"))
    
    60
    -   (:file "defmethod"
    
    61
    -    :depends-on ("pkg"))
    
    62
    -   (:file "find-method"
    
    63
    -    :depends-on ("pkg"))
    
    64
    -   (:file "methods"
    
    65
    -    :depends-on ("pkg"))))
    
    29
    +;; Just smash it with our path so we don't accidentally look up
    
    30
    +;; pcl-files somewhere else.
    
    31
    +(setf asdf:*central-registry*
    
    32
    +      (list (make-pathname :directory (pathname-directory *load-pathname*))))
    
    66 33
     
    
    67
    -(asdf:oos 'asdf:load-op :pcl-test)
    34
    +(require :pcl-tests)
    
    35
    +
    
    36
    +(asdf:oos 'asdf:load-op :pcl-tests)