Skip to content
Snippets Groups Projects
Commit 4b69475a authored by pfdietz's avatar pfdietz
Browse files

More fixes

parent 7150425c
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
(in-package :cl-test) (in-package :cl-test)
(defun compile-file-test (file funname &rest args &key expect-warnings output-file (defun compile-file-test (file funname &rest args &key expect-warnings
expect-style-warnings output-file
print verbose external-format) print verbose external-format)
(declare (ignorable verbose external-format)) (declare (ignorable verbose external-format))
(let* ((target-pathname (or output-file (let* ((target-pathname (or output-file
...@@ -27,7 +28,8 @@ ...@@ -27,7 +28,8 @@
((or error warning) ((or error warning)
#'(lambda (c) #'(lambda (c)
(declare (ignore c)) (declare (ignore c))
(setf actual-warnings-p t) (unless (typep c 'style-warning)
(setf actual-warnings-p t))
nil))) nil)))
(with-output-to-string (with-output-to-string
(*standard-output* str) (*standard-output* str)
...@@ -40,9 +42,9 @@ ...@@ -40,9 +42,9 @@
(destructuring-bind (destructuring-bind
(output-truename warnings-p failure-p) (output-truename warnings-p failure-p)
vals vals
(declare (ignore warnings-p))
(assert (if actual-warnings-p failure-p t)) (assert (if actual-warnings-p failure-p t))
(assert (if expect-warnings failure-p t)) (assert (if expect-warnings failure-p t))
(assert (if expect-style-warnings warnings-p t))
(print (namestring (truename target-pathname))) (print (namestring (truename target-pathname)))
(print (namestring output-truename)) (print (namestring output-truename))
(values (values
...@@ -60,7 +62,7 @@ ...@@ -60,7 +62,7 @@
(deftest compile-file.2 (deftest compile-file.2
(compile-file-test "compile-file-test-file-2.lsp" 'compile-file-test-fun.2 (compile-file-test "compile-file-test-file-2.lsp" 'compile-file-test-fun.2
:expect-warnings t) :expect-style-warnings t)
t t nil nil) t t nil nil)
(deftest compile-file.3 (deftest compile-file.3
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment