diff --git a/test/run-tests.sh b/test/run-tests.sh index fc86f5fbcc03c588a551366a2b7ff176e0addffe..11dab69cae37e81bf840131a988375094ebeffb4 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -90,7 +90,7 @@ do_tests() { echo " $test_pass passing and $test_fail failing" >&2 if [ $test_fail -eq 0 ] ; then echo "all tests apparently successful" >&2 - echo success > ../tmp/results/status + echo success > ../build/results/status else echo "failing test(s): $failed_list" >&2 fi @@ -192,7 +192,7 @@ fi ASDFDIR="$(cd .. ; /bin/pwd)" export CL_SOURCE_REGISTRY="${ASDFDIR}" -export ASDF_OUTPUT_TRANSLATIONS="(:output-translations (\"${ASDFDIR}\" (\"${ASDFDIR}/tmp/fasls\" :implementation)) :ignore-inherited-configuration)" +export ASDF_OUTPUT_TRANSLATIONS="(:output-translations (\"${ASDFDIR}\" (\"${ASDFDIR}/build/fasls\" :implementation)) :ignore-inherited-configuration)" env | grep asdf command="$command $flags" @@ -202,23 +202,23 @@ fi create_config () { - mkdir -p ../tmp/test-source-registry-conf.d ../tmp/test-asdf-output-translations-conf.d + mkdir -p ../build/test-source-registry-conf.d ../build/test-asdf-output-translations-conf.d } clean_up () { - rm -rf ../tmp/test-source-registry-conf.d ../tmp/test-asdf-output-translations-conf.d + rm -rf ../build/test-source-registry-conf.d ../build/test-asdf-output-translations-conf.d } if [ -z "$command" ] ; then echo "Error: cannot find or do not know how to run Lisp named $lisp" else create_config - mkdir -p ../tmp/results - echo failure > ../tmp/results/status + mkdir -p ../build/results + echo failure > ../build/results/status thedate=`date "+%Y-%m-%d"` do_tests "$command" "$eval" 2>&1 | \ - tee "../tmp/results/${lisp}.text" "../tmp/results/${lisp}-${thedate}.save" - read a < ../tmp/results/status + tee "../build/results/${lisp}.text" "../build/results/${lisp}-${thedate}.save" + read a < ../build/results/status clean_up [ success = "$a" ] ## exit code fi diff --git a/test/test-builtin-source-file-type-1.asd b/test/test-builtin-source-file-type-1.asd deleted file mode 100644 index a7065812a4138c38b57ae161dba5f78aae950ad9..0000000000000000000000000000000000000000 --- a/test/test-builtin-source-file-type-1.asd +++ /dev/null @@ -1,5 +0,0 @@ -(defsystem test-builtin-source-file-type-1 - :default-component-class cl-source-file.cl - :serial t - :components ((:cl-source-file "file1") ; for the package - (:file "test-tmp"))) diff --git a/test/test-builtin-source-file-type-2.asd b/test/test-builtin-source-file-type-2.asd deleted file mode 100644 index ae2dab6d18b0b60c0cec667b1ebfcca88d85cde2..0000000000000000000000000000000000000000 --- a/test/test-builtin-source-file-type-2.asd +++ /dev/null @@ -1,5 +0,0 @@ -(defsystem test-builtin-source-file-type-2 - :default-component-class cl-source-file.cl - :serial t - :components ((:file "file1" :type "lisp") ; for package - (:file "test-tmp"))) diff --git a/test/test-builtin-source-file-type-3.asd b/test/test-builtin-source-file-type-3.asd deleted file mode 100644 index fac47c9d6e9959a15460cef6d0e3e23786e3f7c1..0000000000000000000000000000000000000000 --- a/test/test-builtin-source-file-type-3.asd +++ /dev/null @@ -1,5 +0,0 @@ -(defsystem test-builtin-source-file-type-3 - :default-component-class cl-source-file.lsp - :serial t - :components ((:cl-source-file "file1") ; for the package - (:file "test-tmp"))) diff --git a/test/test-builtin-source-file-type-4.asd b/test/test-builtin-source-file-type-4.asd deleted file mode 100644 index 84fcf68062bb865e22ba4e5815b63940cc05e909..0000000000000000000000000000000000000000 --- a/test/test-builtin-source-file-type-4.asd +++ /dev/null @@ -1,5 +0,0 @@ -(defsystem test-builtin-source-file-type-4 - :default-component-class cl-source-file.lsp - :serial t - :components ((:file "file1" :type "lisp") ; for package - (:file "test-tmp"))) diff --git a/test/test-builtin-source-file-type.script b/test/test-builtin-source-file-type.script index 505495b4431e79055962a1732ce5ddd0bdcc02f7..f3d2cca6af5743e42387a22add865da0c93dd095 100644 --- a/test/test-builtin-source-file-type.script +++ b/test/test-builtin-source-file-type.script @@ -6,6 +6,12 @@ (quit-on-error (format t "~D~%" (asdf:asdf-version)) + + (defsystem test-builtin-source-file-type-1 + :default-component-class cl-source-file.cl + :serial t + :components ((:cl-source-file "file1") ; for the package + (:file "test-tmp"))) (load-system 'test-builtin-source-file-type-1 :verbose t) (assert (symbol-value (read-from-string "test-package::*test-tmp-cl*"))) (assert-equal @@ -13,8 +19,20 @@ (mapcar #'asdf:component-pathname (asdf:module-components (asdf:find-system :test-source-file-type-1)))) '("lisp" "cl")) (delete-package :test-package) + + (defsystem test-builtin-source-file-type-2 + :default-component-class cl-source-file.cl + :serial t + :components ((:file "file1" :type "lisp") ; for package + (:file "test-tmp"))) (asdf:load-system 'test-builtin-source-file-type-2 :verbose t) (assert (symbol-value (read-from-string "test-package::*test-tmp-cl*"))) + + (defsystem test-builtin-source-file-type-3 + :default-component-class cl-source-file.lsp + :serial t + :components ((:cl-source-file "file1") ; for the package + (:file "test-tmp"))) (asdf:load-system 'test-builtin-source-file-type-3 :verbose t) (assert (symbol-value (read-from-string "test-package::*test-tmp-cl*"))) (assert-equal @@ -22,5 +40,11 @@ (mapcar #'asdf:component-pathname (asdf:module-components (asdf:find-system :test-source-file-type-1)))) '("lisp" "cl")) (delete-package :test-package) + + (defsystem test-builtin-source-file-type-4 + :default-component-class cl-source-file.lsp + :serial t + :components ((:file "file1" :type "lisp") ; for package + (:file "test-tmp"))) (asdf:load-system 'test-builtin-source-file-type-4 :verbose t) (assert (symbol-value (read-from-string "test-package::*test-tmp-cl*")))) diff --git a/test/test-configuration.script b/test/test-configuration.script index ac5bf362f3fcca0902575d40dbe816b0dcca97d4..ea30fe71ce01f57fc51852d263f23bf1c49ee89e 100644 --- a/test/test-configuration.script +++ b/test/test-configuration.script @@ -6,7 +6,7 @@ (use-package :asdf-test) #+gcl<2.7 (defmacro with-standard-io-syntax (&body body) `(progn ,@body)) -(defparameter *tmp-directory* (subpathname *asdf-directory* "tmp/")) +(defparameter *tmp-directory* (subpathname *asdf-directory* "build/")) (setf *central-registry* nil) (defun under-tmp-directory (designator &optional (defaults *tmp-directory*)) diff --git a/test/test-logical-pathname.script b/test/test-logical-pathname.script index 0853adc75e660f9e469ed212c72afeee0163124c..4e79e08bb5491f47f7c518da820edf2ff1856aad 100644 --- a/test/test-logical-pathname.script +++ b/test/test-logical-pathname.script @@ -10,7 +10,7 @@ `(("**;*.asd.*" ,(make-pathname :type "asd" :defaults (asdf::wilden *asdf-directory*))) ("**;*.lisp.*" ,(make-pathname :type "lisp" :defaults (asdf::wilden *asdf-directory*))) ("**;*.*.*" ,(resolve-location - `(,*asdf-directory* "tmp/fasls" :implementation "logical-host-asdf") + `(,*asdf-directory* "build/fasls" :implementation "logical-host-asdf") :wilden t)))) (quit-on-error diff --git a/test/test-multiple.script b/test/test-multiple.script index 2eeafa6afe1cf43dfa4f348fbd34dee7b25ea5ec..11bc283ab4fb21cbae93c2cdf865d9f3113ea23b 100644 --- a/test/test-multiple.script +++ b/test/test-multiple.script @@ -7,7 +7,7 @@ (quit-on-error (let* ((asd (subpathname *test-directory* "test-multiple.asd")) - (tmp (subpathname *test-directory* "../tmp/")) + (tmp (subpathname *test-directory* "../build/")) (asd2 (subpathname tmp "test-multiple-too.asd")) (file4 (compile-file-pathname* "file4"))) (setf *central-registry* `(,*test-directory* ,tmp))