From 4d0872556153483164eb6145ce37cf50a0bd8d5e Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <tunes@google.com>
Date: Thu, 13 Sep 2012 11:46:10 -0400
Subject: [PATCH] Fix tests to not depend on now-unexported utilities.

---
 test/script-support.lisp           | 14 ++++++++++++--
 test/test-configuration.script     |  6 +++++-
 test/test-multiple.script          |  3 +++
 test/test-static-and-serial.script |  3 +++
 test/test-utilities.script         |  3 +++
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/test/script-support.lisp b/test/script-support.lisp
index a36150304..d6e3e78b4 100644
--- a/test/script-support.lisp
+++ b/test/script-support.lisp
@@ -1,4 +1,14 @@
-(defpackage :asdf-test (:use :common-lisp))
+(defpackage :asdf-test
+  (:use :common-lisp)
+  (:export
+   #:*test-directory* #:*asdf-directory*
+   #:load-asdf
+   #:register-directory #:asdf-load 
+   #:load-asdf-lisp #:compile-asdf #:load-asdf-fasl #:compile-load-asdf #:load-asdf-system
+   #:quit-on-error #:test-asdf
+   #:native-namestring
+   #:exit-lisp #:leave-lisp
+   #:quietly))
 
 (in-package #:asdf-test)
 
@@ -7,7 +17,7 @@
 
 ;;(format t "Evaluating asdf/test/script-support~%")
 
-;; We can't use asdf:merge-pathnames* because ASDF isn't loaded yet.
+;; We can't use asdf::merge-pathnames* because ASDF isn't loaded yet.
 ;; We still want to work despite and host/device funkiness.
 (defparameter *test-directory*
   (make-pathname :name nil :type nil :version nil
diff --git a/test/test-configuration.script b/test/test-configuration.script
index 21a8c032d..55a1906f9 100644
--- a/test/test-configuration.script
+++ b/test/test-configuration.script
@@ -2,6 +2,10 @@
 (load "script-support.lisp")
 (load-asdf)
 
+(in-package :asdf)
+
+(use-package :asdf-test)
+
 (defparameter *test-directory*
   (merge-pathnames* (coerce-pathname "tmp/") *asdf-directory*))
 
@@ -59,7 +63,7 @@
                        :if-does-not-exist :create)
       (format s "(defsystem :foo~D)~%" i))))
 
-(quit-on-error
+(asdf-test:quit-on-error
 
 (assert
  (equal (asdf::parse-output-translations-string "/foo:/bar::/baz:/quux")
diff --git a/test/test-multiple.script b/test/test-multiple.script
index b28cae205..7a9ecc2c3 100644
--- a/test/test-multiple.script
+++ b/test/test-multiple.script
@@ -2,6 +2,9 @@
 (load "script-support.lisp")
 (load-asdf)
 
+(in-package :asdf)
+(use-package :asdf-test)
+
 (quit-on-error
  (let* ((asd (merge-pathnames* (coerce-pathname "test-multiple.asd")
                                *test-directory*))
diff --git a/test/test-static-and-serial.script b/test/test-static-and-serial.script
index 4e5f11964..1b3b9253f 100644
--- a/test/test-static-and-serial.script
+++ b/test/test-static-and-serial.script
@@ -2,6 +2,9 @@
 (load "script-support.lisp")
 (load-asdf)
 
+(in-package :asdf)
+(use-package :asdf-test)
+
 #+gcl (trace coerce-pathname)
 
 (quit-on-error
diff --git a/test/test-utilities.script b/test/test-utilities.script
index a40a77319..8cf58624d 100644
--- a/test/test-utilities.script
+++ b/test/test-utilities.script
@@ -2,6 +2,9 @@
 (load "script-support.lisp")
 (load-asdf)
 
+(in-package :asdf)
+(use-package :asdf-test)
+
 (quit-on-error
 
 (assert
-- 
GitLab