<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5a064eba8729f8aaf152ec1ce938ec63f87c7d6b">https://github.com/macports/macports-ports/commit/5a064eba8729f8aaf152ec1ce938ec63f87c7d6b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5a064eba8729f8aaf152ec1ce938ec63f87c7d6b
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Mon Aug 21 23:23:43 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> cl-lift: backport patch to fix on modern lisps
</span>---
lisp/cl-lift/Portfile | 8 +---
lisp/cl-lift/files/patch-followup.diff | 83 ++++++++++++++++++++++++++++++++++
2 files changed, 85 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lisp/cl-lift/Portfile b/lisp/cl-lift/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a233004ec1..36af9cdd8a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lisp/cl-lift/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lisp/cl-lift/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ master_sites macports_distfiles
</span>
name cl-lift
version 20230111
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
checksums rmd160 57d9bf59e34d1d8fb0c6d951e75f8f6283de15f7 \
sha256 0a91477784c14c82a74d7fe13e0e4b15e7bb988021fd2556909b5e5b3fdb553d \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +27,4 @@ description LIsp Framework for Testing
</span>
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fails as:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# :info:test Unhandled LIFT:ENSURE-NULL-FAILED-ERROR in thread #<SB-THREAD:THREAD "main thread" RUNNING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# :info:test {10047A81B3}>:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# :info:test Ensure null failed: "this fails" evaluates to "this fails" ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-followup.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lisp/cl-lift/files/patch-followup.diff b/lisp/cl-lift/files/patch-followup.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..07dea6453fd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lisp/cl-lift/files/patch-followup.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,83 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/hraban/lift/pull/10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git dev/port.lisp dev/port.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 34e5b47..640aa18 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dev/port.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dev/port.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -169,6 +169,18 @@ returns a string with the corresponding backtrace.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (with-output-to-string (stream)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (core:btcl :stream stream)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#+(or ecl mkcl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++(defun get-backtrace-as-string (error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (declare (ignore error))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (with-output-to-string (stream)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (let* ((top (si:ihs-top))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (backtrace (loop :for ihs :from 0 :below top
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ :collect (list (si::ihs-fun ihs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (si::ihs-env ihs)))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (loop :for i :from 0 :below top
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ :for frame :in (nreverse backtrace) :do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (format stream "~&~D: ~S~%" i frame)))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #+allegro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (defun cancel-current-profile (&key force?)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (when (prof::current-profile-actual prof::*current-profile*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git dev/utilities.lisp dev/utilities.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8b7e0a7..5941905 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dev/utilities.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dev/utilities.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,8 +117,15 @@ pathspac points. For example:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,(format nil "~@[~a-~]~a-~d~@[.~a~]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base-name date-part index base-type)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base-pathname) do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (unless (probe-file name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (return name)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (unless
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #-clisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (probe-file name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #+clisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (ignore-errors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (let ((directory-form (pathname-as-directory pathname)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (when (ext:probe-directory directory-form)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ directory-form)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (return name)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (error "Unable to find unique pathname for ~a" pathname))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (defun date-stamp (&key (datetime (get-universal-time)) (include-time? nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lift-standard.config lift-standard.config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 81b03ee..6f8a556 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lift-standard.config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lift-standard.config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (:report-property :style-sheet "test-style.css")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (:report-property :if-exists :supersede)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (:report-property :format :html)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-(:report-property :name "test-results/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++(:report-property :full-pathname "test-results/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++(:build-report)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++(:report-property :unique-name t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (:build-report)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (:report-property :format :describe)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/lift-test.lisp test/lift-test.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ca52958..19f8f04 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/lift-test.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/lift-test.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -700,9 +700,12 @@ See file COPYING for license
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; :categories (foo bar)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-(addtest (test-break-on-failure-helper)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- failing-test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (ensure-null "this fails"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++;; This test is broken, `failing-test` exists only here, let comment it until
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++;; it's fixed one day.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++;; (addtest (test-break-on-failure-helper)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++;; failing-test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++;; (ensure-null "this fails"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (addtest (test-break-on-failure)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ donot-break-on-failures
</span></pre><pre style='margin:0'>
</pre>