Commit 8436a56d authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

Use the normalized name UIOP instead of asdf-driver in the tests.

parent a9f304ae
;;; -*- Lisp -*-
(defpackage :asdf-pathname-test (:use :asdf :asdf/driver :asdf/common-lisp :asdf/cache :asdf-test))
(defpackage :asdf-pathname-test (:use :asdf :uiop :uiop/common-lisp :asdf/cache :asdf-test))
(in-package :asdf-pathname-test)
;;(setf *unspecific-pathname-type* nil)
......
......@@ -3,5 +3,5 @@
(defsystem :hello-world-example
:build-operation program-op
:entry-point "hello:entry-point"
:depends-on (:asdf-driver)
:depends-on (:uiop)
:components ((:file "hello")))
(defpackage :hello
(:use :cl :asdf/driver)
(:use :cl :uiop)
(:export #:main #:entry-point))
(in-package :hello)
......
......@@ -4,14 +4,14 @@
(load-asdf)
#+ecl (require :cmp)
(asdf-test::register-directory asdf-test::*asdf-directory*) ;; we need asdf-driver, and ECL can dump.
(asdf-test::register-directory asdf-test::*asdf-directory*) ;; we need UIOP, and ECL can dump.
(asdf-test::register-directory asdf-test::*uiop-directory*)
(asdf:upgrade-asdf) ;; may recompile and rename away package asdf?
(asdf-test::frob-packages)
(with-test ()
;;(dolist (s '(:asdf :asdf/driver :asdf/defsystem :uiop)) (DBG :foo s (asdf::builtin-system-p (find-system s))))
;;(dolist (s '(:asdf :uiop :asdf/defsystem :uiop)) (DBG :foo s (asdf::builtin-system-p (find-system s))))
;;(trace perform-plan perform)
(operate 'load-fasl-op :hello-world-example)
(operate 'program-op :hello-world-example))
......@@ -6,7 +6,7 @@ Some constraints:
But we *can* rely on ASDF being present *after* we load it.
* evaluating this file MUST NOT print anything,
because we use it in the forward-ref test to check that nothing is printed.
* We make sure that none of our symbols clash with asdf/driver or asdf,
* We make sure that none of our symbols clash with uiop or asdf,
so we may use-package them during testing.
|#
......@@ -320,7 +320,7 @@ is bound, write a message and exit on an error. If
(verbose t nil)
(loop :for file :in files :do
(load (string-downcase file)))
(setf *package* (some 'find-package '(:asdf :asdf/driver :asdf/utility :asdf/package :asdf-test)))
(setf *package* (some 'find-package '(:asdf :uiop :asdf/utility :asdf/package :asdf-test)))
(load "contrib/debug.lisp"))
(defun load-asdf-lisp (&optional tag)
......@@ -520,7 +520,7 @@ is bound, write a message and exit on an error. If
(defun frob-packages ()
(format t "Frob packages~%")
(use-package :asdf :asdf-test)
(when (find-package :asdf/driver) (use-package :asdf/driver :asdf-test))
(when (find-package :uiop) (use-package :uiop :asdf-test))
(when (find-package :asdf/cache) (use-package :asdf/cache :asdf-test))
(setf *package* (find-package :asdf-test))
t)
......
......@@ -2,4 +2,4 @@
(when (find-package :asdf-test/deferred-warnings)
(delete-package :asdf-test/deferred-warnings)))
(defpackage :asdf-test/deferred-warnings (:use :asdf/driver :asdf/common-lisp))
(defpackage :asdf-test/deferred-warnings (:use :uiop :uiop/common-lisp))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment