Commit 117c5d71 authored by Robert Goldman's avatar Robert Goldman

Repair issues in bundle tests.

parent 4d9e6f40
...@@ -462,12 +462,17 @@ which is probably not what you want; you probably need to tweak your output tran ...@@ -462,12 +462,17 @@ which is probably not what you want; you probably need to tweak your output tran
:if-does-not-exist :create) :if-does-not-exist :create)
(format s ";;; Prebuilt~:[~; monolithic~] ASDF definition for system ~A~%" (format s ";;; Prebuilt~:[~; monolithic~] ASDF definition for system ~A~%"
(operation-monolithic-p o) name) (operation-monolithic-p o) name)
(format s ";;; Built for ~A ~A on a ~A/~A ~A~%" ;; this can cause bugs in cases where one of the functions returns a multi-line
(lisp-implementation-type) ;; string
(lisp-implementation-version) (let ((description-string (format nil ";;; Built for ~A ~A on a ~A/~A ~A"
(software-type) (lisp-implementation-type)
(machine-type) (lisp-implementation-version)
(software-version)) (software-type)
(machine-type)
(software-version))))
;; ensure the whole thing is on one line
(print (remove-if #'(lambda (x) (member x (list #\newline #\return))) description-string) s)
(terpri s))
(let ((*package* (find-package :asdf-user))) (let ((*package* (find-package :asdf-user)))
(pprint `(defsystem ,name (pprint `(defsystem ,name
:class prebuilt-system :class prebuilt-system
......
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
(defsystem :deliver-bundle (defsystem :deliver-bundle
:defsystem-depends-on ("file3-only") :defsystem-depends-on ("file3-only")
:depends-on ("test-asdf/bundle-2") :depends-on ("test1") ; brings in "file1" and "file2"
:components ((:file "file4"))) :components ((:file "file4")))
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
;;; Test for GitLab issue 23 ;;; Test for GitLab issue 23
;;;--------------------------------------------------------------------------- ;;;---------------------------------------------------------------------------
#+(or (and ecl ecl-bytecmp) gcl)
(leave-test "bundles not on implemented this implementation" 0)
(defparameter *test-system-name* "deliver-bundle") (defparameter *test-system-name* "deliver-bundle")
(asdf:initialize-source-registry '(:source-registry (asdf:initialize-source-registry '(:source-registry
...@@ -49,7 +52,7 @@ ...@@ -49,7 +52,7 @@
(assert (equalp (getf *defsystem-sexpr* :lib) (assert (equalp (getf *defsystem-sexpr* :lib)
"deliver-bundle.a")) "deliver-bundle.a"))
(assert (not (getf *defsystem-sexpr* :defsystem-depends-on))) (assert (not (getf *defsystem-sexpr* :defsystem-depends-on)))
(assert (equalp (getf *defsystem-sexpr* :depends-on) (list "test-asdf/bundle-2")) (assert (equalp (getf *defsystem-sexpr* :depends-on) (list "test1"))
nil "Dependencies for bundled system are incorrect.") nil "Dependencies for bundled system are incorrect.")
(ignore-errors (delete-file *constructed-asdf-file*)) (ignore-errors (delete-file *constructed-asdf-file*))
......
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