Commit 0999c0db authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Stop using tmp/ algother during testing.

parent d2bbf816
...@@ -90,7 +90,7 @@ do_tests() { ...@@ -90,7 +90,7 @@ do_tests() {
echo " $test_pass passing and $test_fail failing" >&2 echo " $test_pass passing and $test_fail failing" >&2
if [ $test_fail -eq 0 ] ; then if [ $test_fail -eq 0 ] ; then
echo "all tests apparently successful" >&2 echo "all tests apparently successful" >&2
echo success > ../tmp/results/status echo success > ../build/results/status
else else
echo "failing test(s): $failed_list" >&2 echo "failing test(s): $failed_list" >&2
fi fi
...@@ -192,7 +192,7 @@ fi ...@@ -192,7 +192,7 @@ fi
ASDFDIR="$(cd .. ; /bin/pwd)" ASDFDIR="$(cd .. ; /bin/pwd)"
export CL_SOURCE_REGISTRY="${ASDFDIR}" 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 env | grep asdf
command="$command $flags" command="$command $flags"
...@@ -202,23 +202,23 @@ fi ...@@ -202,23 +202,23 @@ fi
create_config () { 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 () { 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 if [ -z "$command" ] ; then
echo "Error: cannot find or do not know how to run Lisp named $lisp" echo "Error: cannot find or do not know how to run Lisp named $lisp"
else else
create_config create_config
mkdir -p ../tmp/results mkdir -p ../build/results
echo failure > ../tmp/results/status echo failure > ../build/results/status
thedate=`date "+%Y-%m-%d"` thedate=`date "+%Y-%m-%d"`
do_tests "$command" "$eval" 2>&1 | \ do_tests "$command" "$eval" 2>&1 | \
tee "../tmp/results/${lisp}.text" "../tmp/results/${lisp}-${thedate}.save" tee "../build/results/${lisp}.text" "../build/results/${lisp}-${thedate}.save"
read a < ../tmp/results/status read a < ../build/results/status
clean_up clean_up
[ success = "$a" ] ## exit code [ success = "$a" ] ## exit code
fi fi
(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")))
(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")))
(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")))
(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")))
...@@ -6,6 +6,12 @@ ...@@ -6,6 +6,12 @@
(quit-on-error (quit-on-error
(format t "~D~%" (asdf:asdf-version)) (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) (load-system 'test-builtin-source-file-type-1 :verbose t)
(assert (symbol-value (read-from-string "test-package::*test-tmp-cl*"))) (assert (symbol-value (read-from-string "test-package::*test-tmp-cl*")))
(assert-equal (assert-equal
...@@ -13,8 +19,20 @@ ...@@ -13,8 +19,20 @@
(mapcar #'asdf:component-pathname (asdf:module-components (asdf:find-system :test-source-file-type-1)))) (mapcar #'asdf:component-pathname (asdf:module-components (asdf:find-system :test-source-file-type-1))))
'("lisp" "cl")) '("lisp" "cl"))
(delete-package :test-package) (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) (asdf:load-system 'test-builtin-source-file-type-2 :verbose t)
(assert (symbol-value (read-from-string "test-package::*test-tmp-cl*"))) (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) (asdf:load-system 'test-builtin-source-file-type-3 :verbose t)
(assert (symbol-value (read-from-string "test-package::*test-tmp-cl*"))) (assert (symbol-value (read-from-string "test-package::*test-tmp-cl*")))
(assert-equal (assert-equal
...@@ -22,5 +40,11 @@ ...@@ -22,5 +40,11 @@
(mapcar #'asdf:component-pathname (asdf:module-components (asdf:find-system :test-source-file-type-1)))) (mapcar #'asdf:component-pathname (asdf:module-components (asdf:find-system :test-source-file-type-1))))
'("lisp" "cl")) '("lisp" "cl"))
(delete-package :test-package) (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) (asdf:load-system 'test-builtin-source-file-type-4 :verbose t)
(assert (symbol-value (read-from-string "test-package::*test-tmp-cl*")))) (assert (symbol-value (read-from-string "test-package::*test-tmp-cl*"))))
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
(use-package :asdf-test) (use-package :asdf-test)
#+gcl<2.7 (defmacro with-standard-io-syntax (&body body) `(progn ,@body)) #+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) (setf *central-registry* nil)
(defun under-tmp-directory (designator &optional (defaults *tmp-directory*)) (defun under-tmp-directory (designator &optional (defaults *tmp-directory*))
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
`(("**;*.asd.*" ,(make-pathname :type "asd" :defaults (asdf::wilden *asdf-directory*))) `(("**;*.asd.*" ,(make-pathname :type "asd" :defaults (asdf::wilden *asdf-directory*)))
("**;*.lisp.*" ,(make-pathname :type "lisp" :defaults (asdf::wilden *asdf-directory*))) ("**;*.lisp.*" ,(make-pathname :type "lisp" :defaults (asdf::wilden *asdf-directory*)))
("**;*.*.*" ,(resolve-location ("**;*.*.*" ,(resolve-location
`(,*asdf-directory* "tmp/fasls" :implementation "logical-host-asdf") `(,*asdf-directory* "build/fasls" :implementation "logical-host-asdf")
:wilden t)))) :wilden t))))
(quit-on-error (quit-on-error
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
(quit-on-error (quit-on-error
(let* ((asd (subpathname *test-directory* "test-multiple.asd")) (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")) (asd2 (subpathname tmp "test-multiple-too.asd"))
(file4 (compile-file-pathname* "file4"))) (file4 (compile-file-pathname* "file4")))
(setf *central-registry* `(,*test-directory* ,tmp)) (setf *central-registry* `(,*test-directory* ,tmp))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment