Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
asdf
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
15
Issues
15
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
asdf
asdf
Commits
117c5d71
Commit
117c5d71
authored
Feb 03, 2020
by
Robert Goldman
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Repair issues in bundle tests.
parent
4d9e6f40
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
8 deletions
+16
-8
bundle.lisp
bundle.lisp
+11
-6
test/deliver-bundle.asd
test/deliver-bundle.asd
+1
-1
test/test-bundle-asd.script
test/test-bundle-asd.script
+4
-1
No files found.
bundle.lisp
View file @
117c5d71
...
...
@@ -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~%"
;; 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
))
(
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
...
...
test/deliver-bundle.asd
View file @
117c5d71
...
...
@@ -6,5 +6,5 @@
(
defsystem
:deliver-bundle
:defsystem-depends-on
(
"file3-only"
)
:depends-on
(
"test
-asdf/bundle-2"
)
:depends-on
(
"test
1"
)
; brings in "file1" and "file2"
:components
((
:file
"file4"
)))
test/test-bundle-asd.script
View file @
117c5d71
...
...
@@ -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 "test
1
"))
nil "Dependencies for bundled system are incorrect.")
(ignore-errors (delete-file *constructed-asdf-file*))
...
...
Robert Goldman
@rgoldman
mentioned in issue
#23 (closed)
·
Feb 04, 2020
mentioned in issue
#23 (closed)
mentioned in issue #23
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment