From efaaddf74f280ee9b4424fe6e29af8f1d7a6f9c7 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <tunes@google.com>
Date: Sat, 2 Aug 2014 06:44:11 -0400
Subject: [PATCH] tools: move install-asdf from test-basic to build

---
 tools/build.lisp        | 24 ++++++++++++++++++++++++
 tools/install-asdf.lisp |  2 +-
 tools/test-basic.lisp   | 23 -----------------------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/tools/build.lisp b/tools/build.lisp
index 0dc39682..df0023db 100644
--- a/tools/build.lisp
+++ b/tools/build.lisp
@@ -25,3 +25,27 @@
     (terpri)
     (run `(pipe (wc header.lisp ,@(driver-files) ,@(asdf-defsystem-files)) (tail -n 1)))))
 
+
+;;; BONUS: install asdf as module for your favorite Lisp implementation.
+(deftestcmd install-asdf (lisp)
+  "install asdf as a module on specified Lisp"
+  (flet ((doit ()
+           (with-asdf-dir ()
+             (run-test-lisp
+              (format nil "installing ASDF to be provided as a module on ~(~A~)" lisp)
+              '((load "tools/install-asdf.lisp")(uiop:quit))
+              :lisp lisp))))
+    (case lisp
+      ((:allegro :allegromodern :ccl :clisp :cmucl :lispworks :sbcl :scl :xcl)
+       (doit))
+      ((:abcl :ecl :ecl_bytecodes :mkcl)
+       (format t "Upgrading the implementation-provided ASDF on ~(~A~) isn't supported (yet).
+Happily, that implementation is known to keep ASDF reasonably up to date.~%" lisp))
+      ((:cormancl :gcl :genera :mcl :mocl)
+       (format t "Installing ASDF so it is provided by ~(~A~) isn't supported.
+If you care, go hack the implementation.~%" lisp))
+      (otherwise
+       (if (string-prefix-p "allegro" (string-downcase lisp))
+           (doit)
+           (error "Unknown implementation ~(~A~)" lisp))))))
+
diff --git a/tools/install-asdf.lisp b/tools/install-asdf.lisp
index 49bd8fca..9d500f11 100644
--- a/tools/install-asdf.lisp
+++ b/tools/install-asdf.lisp
@@ -1,6 +1,6 @@
 ":" ; exec cl-launch "$0" "$@" # -*- Lisp -*-
 #|
-Usage: ./tools/asdf-tools install-asdf-as-module l=lispworks
+Usage: ./tools/asdf-tools install-asdf l=lispworks
 
 This script will install the current version of ASDF
 as a module pre-compiled for your implementation,
diff --git a/tools/test-basic.lisp b/tools/test-basic.lisp
index f86f788a..62722214 100644
--- a/tools/test-basic.lisp
+++ b/tools/test-basic.lisp
@@ -54,29 +54,6 @@ Use your preferred lisp implementation and check that asdf is loaded without any
            (log! log "BAD: Loading ASDF on ~(~A~) produces messages" lisp)
            (return nil))))))
 
-;;; BONUS: install asdf as module for your favorite Lisp implementation.
-(deftestcmd install-asdf (lisp)
-  "install asdf as a module on specified Lisp"
-  (flet ((doit ()
-           (with-asdf-dir ()
-             (run-test-lisp
-              (format nil "installing ASDF to be provided as a module on ~(~A~)" lisp)
-              '((load "tools/install-asdf.lisp")(uiop:quit))
-              :lisp lisp))))
-    (case lisp
-      ((:allegro :allegromodern :ccl :clisp :cmucl :lispworks :sbcl :scl :xcl)
-       (doit))
-      ((:abcl :ecl :ecl_bytecodes :mkcl)
-       (format t "Upgrading the implementation-provided ASDF on ~(~A~) isn't supported (yet).
-Happily, that implementation is known to keep ASDF reasonably up to date.~%" lisp))
-      ((:cormancl :gcl :genera :mcl :mocl)
-       (format t "Installing ASDF so it is provided by ~(~A~) isn't supported.
-If you care, go hack the implementation.~%" lisp))
-      (otherwise
-       (if (string-prefix-p "allegro" (string-downcase lisp))
-           (doit)
-           (error "Unknown implementation ~(~A~)" lisp))))))
-
 (deftestcmd test-basic (lisp systems)
   "basic test: doc, clean-load, load-systems"
   (doc)
-- 
GitLab