From 117c5d71fcc575d99d327e226beaadba161c8029 Mon Sep 17 00:00:00 2001 From: "Robert P. Goldman" Date: Mon, 3 Feb 2020 22:26:04 -0600 Subject: [PATCH] Repair issues in bundle tests. --- bundle.lisp | 17 +++++++++++------ test/deliver-bundle.asd | 2 +- test/test-bundle-asd.script | 5 ++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/bundle.lisp b/bundle.lisp index 5bcf1933..89e254ed 100644 --- a/bundle.lisp +++ b/bundle.lisp @@ -462,12 +462,17 @@ which is probably not what you want; you probably need to tweak your output tran :if-does-not-exist :create) (format s ";;; Prebuilt~:[~; monolithic~] ASDF definition for system ~A~%" (operation-monolithic-p o) name) - (format s ";;; Built for ~A ~A on a ~A/~A ~A~%" - (lisp-implementation-type) - (lisp-implementation-version) - (software-type) - (machine-type) - (software-version)) + ;; this can cause bugs in cases where one of the functions returns a multi-line + ;; string + (let ((description-string (format nil ";;; Built for ~A ~A on a ~A/~A ~A" + (lisp-implementation-type) + (lisp-implementation-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))) (pprint `(defsystem ,name :class prebuilt-system diff --git a/test/deliver-bundle.asd b/test/deliver-bundle.asd index aed0ee15..a759bd82 100644 --- a/test/deliver-bundle.asd +++ b/test/deliver-bundle.asd @@ -6,5 +6,5 @@ (defsystem :deliver-bundle :defsystem-depends-on ("file3-only") - :depends-on ("test-asdf/bundle-2") + :depends-on ("test1") ; brings in "file1" and "file2" :components ((:file "file4"))) diff --git a/test/test-bundle-asd.script b/test/test-bundle-asd.script index 767b0a3e..af877143 100644 --- a/test/test-bundle-asd.script +++ b/test/test-bundle-asd.script @@ -6,6 +6,9 @@ ;;; 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") (asdf:initialize-source-registry '(:source-registry @@ -49,7 +52,7 @@ (assert (equalp (getf *defsystem-sexpr* :lib) "deliver-bundle.a")) (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.") (ignore-errors (delete-file *constructed-asdf-file*)) -- GitLab