From 43ef7d947f4b4de767d0f91f28b50d9c03ad29d6 Mon Sep 17 00:00:00 2001 From: Gary King Date: Wed, 16 May 2012 08:07:26 -0400 Subject: [PATCH] Update test to work around SBCL cleverness (thanks to Patrick Stein) Also various other tweaks. --- dev/map-backtrace.lisp | 6 ++--- lift-standard.config | 6 ++--- test/tests.lisp | 1 + website/source/resources/footer.md | 2 +- website/source/resources/header.md | 2 +- website/website.tmproj | 48 +++++++------------------------------- 6 files changed, 16 insertions(+), 49 deletions(-) diff --git a/dev/map-backtrace.lisp b/dev/map-backtrace.lisp index 6b680b9..43eddda 100644 --- a/dev/map-backtrace.lisp +++ b/dev/map-backtrace.lisp @@ -101,7 +101,5 @@ #-(or ccl sbcl) (defun impl-map-backtrace (func) - (funcall func (format nil "unable to map backtrace for ~a" - (lisp-implementation-type)))) - - + (declare (ignore func)) + (warn "unable to map backtrace for ~a" (lisp-implementation-type))) \ No newline at end of file diff --git a/lift-standard.config b/lift-standard.config index 5213a1b..0f22312 100644 --- a/lift-standard.config +++ b/lift-standard.config @@ -17,17 +17,17 @@ (:report-property :style-sheet "test-style.css") (:report-property :if-exists :supersede) (:report-property :format :html) -(:report-property :name "test-results/test-report.html") +(:report-property :full-pathname "test-results/test-report.html") (:report-property :unique-name t) (:build-report) (:report-property :unique-name t) (:report-property :format :describe) -(:report-property :name "test-results/test-report.txt") +(:report-property :full-pathname "test-results/test-report.txt") (:build-report) (:report-property :format :save) -(:report-property :name "test-results/test-report.sav") +(:report-property :full-pathname "test-results/test-report.sav") (:build-report) (:report-property :format :describe) diff --git a/test/tests.lisp b/test/tests.lisp index 24b7171..9b32090 100644 --- a/test/tests.lisp +++ b/test/tests.lisp @@ -9,6 +9,7 @@ (handler-case (let ((x 1)) (let ((y (- x (expt 1024 0)))) + (declare (optimize (safety 3))) (/ 2 y))) (error (c) (setf output (print-backtrace c :output nil)))) diff --git a/website/source/resources/footer.md b/website/source/resources/footer.md index 15b6778..c5bf3c4 100644 --- a/website/source/resources/footer.md +++ b/website/source/resources/footer.md @@ -7,7 +7,7 @@ Common-Lisp.net button -### Copyright (c) 2008 Gary Warren King (gwking@metabang.com) +### Copyright (c) 2009 - 2011 Gary Warren King (gwking@metabang.com) trivial-backtrace has an [MIT style][mit-license] license diff --git a/website/source/resources/header.md b/website/source/resources/header.md index fa5287a..2738c47 100644 --- a/website/source/resources/header.md +++ b/website/source/resources/header.md @@ -1,7 +1,7 @@ {include shared-links.md} {set-property html yes} -{set-property style-sheet "http://common-lisp.net/project/cl-containers/shared/style-200.css"} +{set-property style-sheet "styles.css"} {set-property author "Gary Warren King"} {set-property title "trivial-backtrace | watch where you've been"} diff --git a/website/website.tmproj b/website/website.tmproj index 49ad15f..01b745b 100644 --- a/website/website.tmproj +++ b/website/website.tmproj @@ -3,7 +3,7 @@ currentDocument - source/index.md + source/resources/header.md documents @@ -28,37 +28,21 @@ column 0 line - 67 + 0 - columnSelection - firstVisibleColumn 0 firstVisibleLine - 42 - selectFrom - - column - 49 - line - 70 - - selectTo - - column - 0 - line - 67 - + 0 source/resources/footer.md caret column - 0 + 29 line - 10 + 9 firstVisibleColumn 0 @@ -70,30 +54,14 @@ caret column - 0 + 27 line - 11 + 3 - columnSelection - firstVisibleColumn 0 firstVisibleLine 0 - selectFrom - - column - 0 - line - 7 - - selectTo - - column - 0 - line - 11 - source/resources/navigation.md @@ -120,6 +88,6 @@ showFileHierarchyDrawer windowFrame - {{189, 100}, {578, 778}} + {{615, 0}, {578, 778}} -- 2.11.4.GIT