From 69019dda0cbe458dc25f1e4e2520de96506d1984 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <fare@tunes.org> Date: Fri, 29 Oct 2010 04:57:27 -0700 Subject: [PATCH] Fix internal assertion/initialization ordering problem in test/test-configuration.script Enable extra debugging while testing (except on allegro personal where it blows up the heap) --- test/compile-asdf.lisp | 2 ++ test/script-support.lisp | 3 +++ test/test-configuration.script | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/test/compile-asdf.lisp b/test/compile-asdf.lisp index ce1742df..1b150ec7 100644 --- a/test/compile-asdf.lisp +++ b/test/compile-asdf.lisp @@ -1,5 +1,7 @@ (in-package #:common-lisp-user) +(proclaim '(optimize (speed 2) (safety 3) #-allegro (debug 3))) + (load (make-pathname :name "script-support" :defaults *load-pathname*)) (cond diff --git a/test/script-support.lisp b/test/script-support.lisp index eb354fa7..0e144088 100644 --- a/test/script-support.lisp +++ b/test/script-support.lisp @@ -1,5 +1,8 @@ (in-package #:common-lisp-user) +(declaim (optimize (speed 2) (safety 3) #-allegro (debug 3))) +(proclaim '(optimize (speed 2) (safety 3) #-allegro (debug 3))) + ;; We can't use asdf:merge-pathnames* because ASDF isn't loaded yet. ;; We still want to work despite and host/device funkiness. (defparameter *test-directory* diff --git a/test/test-configuration.script b/test/test-configuration.script index 96477fa5..5b0e4552 100644 --- a/test/test-configuration.script +++ b/test/test-configuration.script @@ -46,8 +46,6 @@ (cl-user::quit-on-error -(format t "~&subdirectories of dir2/: ~S~%" (subdirectories (under-test-directory "dir2/"))) -(assert (= 2 (length (subdirectories (under-test-directory "dir2/"))))) (assert (equal (parse-output-translations-string "/foo:/bar::/baz:/quux") '(:output-translations @@ -72,6 +70,9 @@ (create-asd-files) (create-conf-files) +(format t "~&subdirectories of dir2/: ~S~%" (subdirectories (under-test-directory "dir2/"))) +(assert (= 2 (length (subdirectories (under-test-directory "dir2/"))))) + (initialize-source-registry `(:source-registry (:include ,(under-test-directory "conf.d/")) :ignore-inherited-configuration)) -- GitLab