diff --git a/test/compile-asdf.lisp b/test/compile-asdf.lisp index c4b0b2d09bb8c4058613f4349c5f4b33b7587e15..08ea80377d62dead1f4c08264c5cbcf583c5b126 100644 --- a/test/compile-asdf.lisp +++ b/test/compile-asdf.lisp @@ -3,11 +3,8 @@ (proclaim '(optimize (speed 2) (safety 3) #-allegro (debug 3))) (load (make-pathname :name "script-support" :defaults *load-pathname*)) -#+ecl -(eval-when (:compile-toplevel :load-toplevel :execute) - (shadow 'cl:compile-file :common-lisp-user)) -#+ecl (defun compile-file (&rest args) (apply 'cl:compile-file args)) -#+ecl (trace compile-file) +(defun my-compile-file (&rest args) (apply 'compile-file args)) +#+ecl (trace my-compile-file) (cond ((not (probe-file *asdf-lisp*)) @@ -22,20 +19,21 @@ (multiple-value-bind (result warnings-p errors-p) ;; style warnings shouldn't abort the compilation [2010/02/03:rpg] (handler-bind (#+sbcl (sb-c::simple-compiler-note #'muffle-warning) - #+ecl ((or c:compiler-note c::compiler-debug-note) #'muffle-warning) + #+ecl ((or c:compiler-note c::compiler-debug-note + c:compiler-warning) ;; ECL emits more serious warnings than it should. + #'muffle-warning) (style-warning #'(lambda (w) - #+ecl - (format *error-output* "~&Got a ~S:~%~A~%" (type-of w) w) - #-ecl ;; escalate style-warnings to warnings - we don't want them. - (warn "Can you please fix ASDF to not emit style-warnings? Got:~%~A" w) + ;; escalate style-warnings to warnings - we don't want them. + (warn "Can you please fix ASDF to not emit style-warnings? Got a ~S:~%~A" + (type-of w) w) (muffle-warning w)))) - (compile-file *asdf-lisp* :output-file tmp :print t :verbose t)) + (my-compile-file *asdf-lisp* :output-file tmp :print t :verbose t)) (declare (ignore result)) (cond (errors-p (leave-lisp "Testsuite failed: ASDF compiled with ERRORS" 2)) - #-ecl ;; ECL 10.7.1 has spurious warnings + #-ecl ;; ECL 11.1.1 has spurious warnings (warnings-p (leave-lisp "Testsuite failed: ASDF compiled with warnings" 1)) (t