From 94fec76ffffe2cf46c91582dd338e75f102dcc2b Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <tunes@google.com>
Date: Tue, 5 Mar 2013 18:54:53 -0500
Subject: [PATCH] Fix upgrade test. Tweak other tests for uiop.

---
 test/make-hello-world.lisp   | 2 +-
 test/script-support.lisp     | 3 +++
 test/test-encodings.script   | 2 +-
 test/test-program.script     | 2 +-
 test/test-sysdef-asdf.script | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/make-hello-world.lisp b/test/make-hello-world.lisp
index de6a5e334..4d8618c53 100644
--- a/test/make-hello-world.lisp
+++ b/test/make-hello-world.lisp
@@ -6,6 +6,6 @@
 
 (with-test ()
   (register-directory *asdf-directory*) ;; we need asdf-driver, and ECL can dump.
-  (register-directory (subpathname *asdf-directory* "uiop/"))
+  (register-directory *uiop-directory*)
   (operate 'load-fasl-op :hello-world-example)
   (operate 'program-op :hello-world-example))
diff --git a/test/script-support.lisp b/test/script-support.lisp
index ae049dfd1..afab15b19 100644
--- a/test/script-support.lisp
+++ b/test/script-support.lisp
@@ -161,6 +161,8 @@ Some constraints:
 (defun back-dir () #-gcl :back #+gcl :parent)
 (defparameter *asdf-directory*
   (truename (make-sub-pathname :directory (relative-dir (back-dir)) :defaults *test-directory*)))
+(defparameter *uiop-directory*
+  (truename (make-sub-pathname :directory (relative-dir "uiop") :defaults *asdf-directory*)))
 (defparameter *build-directory*
   (make-sub-pathname :directory (relative-dir "build") :defaults *asdf-directory*))
 (defparameter *implementation*
@@ -326,6 +328,7 @@ is bound, write a message and exit on an error.  If
 (defun load-asdf-system (&rest keys)
   (quietly
    (register-directory *asdf-directory*)
+   (register-directory *uiop-directory*)
    (apply (asym :oos) (asym :load-op) :asdf keys)))
 
 (defun call-with-asdf-conditions (thunk &optional verbose)
diff --git a/test/test-encodings.script b/test/test-encodings.script
index 903aebcf2..2012138be 100644
--- a/test/test-encodings.script
+++ b/test/test-encodings.script
@@ -64,7 +64,7 @@
 ;; Try to load asdf-encodings
 (setf *central-registry*
       (list *asdf-directory* ;; be sure that *OUR* asdf is first of any possible ASDF
-            (subpathname *asdf-directory* "uiop/") ;; be sure that *OUR* asdf is first of any possible ASDF
+            *uiop-directory* ;; be sure that ouir uiop is there, too.
             ;; try finding asdf-encodings it right next to asdf.
             (subpathname *asdf-directory* "../asdf-encodings/")))
 (unless (find-system :asdf-encodings nil)
diff --git a/test/test-program.script b/test/test-program.script
index 38b14b3f0..68fca6de5 100644
--- a/test/test-program.script
+++ b/test/test-program.script
@@ -16,7 +16,7 @@
 ;; Try to load lisp-invocation from xcvb
 (setf *central-registry*
       (list *asdf-directory* ;; be sure that *OUR* asdf is first of any possible ASDF
-            (subpathname *asdf-directory* "uiop/")
+            *uiop-directory*
             ;; try finding xcvb's lisp-invocation right next to asdf.
             (subpathname *asdf-directory* "../xcvb/")))
 (unless (find-system :lisp-invocation nil)
diff --git a/test/test-sysdef-asdf.script b/test/test-sysdef-asdf.script
index c6bf0d9dc..9d3ca4c3b 100644
--- a/test/test-sysdef-asdf.script
+++ b/test/test-sysdef-asdf.script
@@ -7,6 +7,6 @@
 (initialize-source-registry
  `(:source-registry
    (:directory ,*asdf-directory*)
-   (:directory ,(subpathname *asdf-directory* "uiop/"))
+   (:directory ,*uiop-directory*)
    :ignore-inherited-configuration))
 (load-system :asdf)
-- 
GitLab