From 38337a5a2e353f6921852c62e38e855ba88fa2d3 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <tunes@google.com>
Date: Mon, 30 Dec 2013 03:39:57 -0500
Subject: [PATCH] Trivial package-system test. Hush a bit
 asdf-pathname-test.script.

---
 test/asdf-pathname-test.script                   |  4 ++--
 test/package-system-test.script                  |  3 +++
 test/package-system-test/a.lisp                  |  1 +
 test/package-system-test/b.lisp                  |  1 +
 test/package-system-test/c.lisp                  |  1 +
 test/package-system-test/d.lisp                  |  1 +
 test/package-system-test/package-system-test.asd |  6 ++++++
 test/test-asdf.asd                               | 14 +++++++-------
 test/test-version.script                         |  6 +++---
 9 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 test/package-system-test.script
 create mode 100644 test/package-system-test/a.lisp
 create mode 100644 test/package-system-test/b.lisp
 create mode 100644 test/package-system-test/c.lisp
 create mode 100644 test/package-system-test/d.lisp
 create mode 100644 test/package-system-test/package-system-test.asd

diff --git a/test/asdf-pathname-test.script b/test/asdf-pathname-test.script
index a5d4e335..fb4176e1 100644
--- a/test/asdf-pathname-test.script
+++ b/test/asdf-pathname-test.script
@@ -378,8 +378,8 @@
                (dolist (file test-files)
                  (ensure-directories-exist file)
                  (with-open-file (stream file :direction :output :if-exists :supersede :if-does-not-exist :create)
-                   (println ":dummy-content" stream)
-                   (format t "Created test file ~S~%" file)))
+                   ;;(format t "Created test file ~S~%" file)
+                   (println ":dummy-content" stream)))
                (multiple-value-bind (second minute hour day month year)
                    (decode-universal-time (setf start-time (get-universal-time)) 0)
                  (let ((header (format nil "~4,'0d~2,'0d~2,'0dT~2,'0d~2,'0d~2,'0dZ : ~a ~a ~a"
diff --git a/test/package-system-test.script b/test/package-system-test.script
new file mode 100644
index 00000000..f1f79133
--- /dev/null
+++ b/test/package-system-test.script
@@ -0,0 +1,3 @@
+(register-directory (subpathname *test-directory* "package-system-test/"))
+(load-system :package-system-test/a/x)
+(load-system :package-system-test/d)
diff --git a/test/package-system-test/a.lisp b/test/package-system-test/a.lisp
new file mode 100644
index 00000000..cf79f4dc
--- /dev/null
+++ b/test/package-system-test/a.lisp
@@ -0,0 +1 @@
+(defpackage package-system-test/a (:use cl))
diff --git a/test/package-system-test/b.lisp b/test/package-system-test/b.lisp
new file mode 100644
index 00000000..583caf01
--- /dev/null
+++ b/test/package-system-test/b.lisp
@@ -0,0 +1 @@
+(defpackage package-system-test/b (:use cl package-system-test/a))
diff --git a/test/package-system-test/c.lisp b/test/package-system-test/c.lisp
new file mode 100644
index 00000000..80734f3d
--- /dev/null
+++ b/test/package-system-test/c.lisp
@@ -0,0 +1 @@
+(defpackage package-system-test/c (:use cl package-system-test/a))
diff --git a/test/package-system-test/d.lisp b/test/package-system-test/d.lisp
new file mode 100644
index 00000000..b0f92a6e
--- /dev/null
+++ b/test/package-system-test/d.lisp
@@ -0,0 +1 @@
+(defpackage package-system-test/d (:use cl package-system-test/b package-system-test/c))
diff --git a/test/package-system-test/package-system-test.asd b/test/package-system-test/package-system-test.asd
new file mode 100644
index 00000000..cf158fdd
--- /dev/null
+++ b/test/package-system-test/package-system-test.asd
@@ -0,0 +1,6 @@
+(in-package :asdf)
+
+(defsystem package-system-test
+  :class package-system
+  :defsystem-depends-on
+  #.(unless (find-class 'package-system nil) '(:asdf-package-system)))
diff --git a/test/test-asdf.asd b/test/test-asdf.asd
index 39c1e21d..50234fbe 100644
--- a/test/test-asdf.asd
+++ b/test/test-asdf.asd
@@ -2,25 +2,25 @@
   (:use :cl :asdf))
 (in-package :test-asdf-system)
 
-(defsystem :test-asdf)
+(defsystem :test-asdf :class package-system)
 
 (defsystem :test-asdf/all
   :version "0"
-  :depends-on ((:version :test-asdf/file2 "2")
-               :test-asdf/file4))
+  :depends-on ((:version :test-asdf/2 "2")
+               :test-asdf/4))
 
-(defsystem :test-asdf/file1
+(defsystem :test-asdf/1
   :components ((:file "file1" :if-feature :common-lisp)
                (:file "does-not-exist" :if-feature (:not :common-lisp))))
 
-(defsystem :test-asdf/file2
+(defsystem :test-asdf/2
   :version "2.2"
-  :depends-on (:test-asdf/file1)
+  :depends-on (:test-asdf/1)
   :components ((:module "foo" :pathname ""
                 :components ((:module "bar" :pathname ""
                               :components ((:file "file2")))))))
 
-(defsystem :test-asdf/file4
+(defsystem :test-asdf/4
   :components ((:file "file3")
                (:file "file4" :in-order-to ((load-op (load-op "file3"))
                                             (compile-op (load-op "file3"))))))
diff --git a/test/test-version.script b/test/test-version.script
index 63cc8802..6d231917 100644
--- a/test/test-version.script
+++ b/test/test-version.script
@@ -22,17 +22,17 @@
   :version "1.1")
 
 (def-test-system :versioned-system-3
-  :defsystem-depends-on ((:version :test-asdf/file2 "2.1"))
+  :defsystem-depends-on ((:version :test-asdf/2 "2.1"))
   :pathname #.*test-directory*
   :version "1.2")
 
 (def-test-system :versioned-system-file-form
-  :defsystem-depends-on ((:version :test-asdf/file2 "2.1"))
+  :defsystem-depends-on ((:version :test-asdf/2 "2.1"))
   :pathname #.*test-directory*
   :version (:read-file-form "version.lisp-expr" :at 0))
 
 (def-test-system :versioned-system-file-line
-  :defsystem-depends-on ((:version :test-asdf/file2 "2.1"))
+  :defsystem-depends-on ((:version :test-asdf/2 "2.1"))
   :pathname #.*test-directory*
   :version (:read-file-line "version.lisp-expr" :at 1))
 
-- 
GitLab