Commit 9517e607 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Fix os detection in run-test

This shall address Allegro testing issues on Windows.

Also, no need for an ALLEGRO_NOISY variable.
parent 39f69317
...@@ -181,9 +181,9 @@ do_tests () { ...@@ -181,9 +181,9 @@ do_tests () {
# not used currently but leave here for future reference. # not used currently but leave here for future reference.
# #
case $(uname) in case $(uname) in
CYGWIN*) os=windows ;; CYGWIN*|MSYS_NT*) os=windows ;;
Darwin) os=macos ;; Darwin*) os=macos ;;
Linux) os=linux ;; Linux*) os=linux ;;
*) os=unknown ;; *) os=unknown ;;
esac esac
...@@ -223,9 +223,9 @@ case "$lisp" in ...@@ -223,9 +223,9 @@ case "$lisp" in
# echo ALLEGRO=$ALLEGRO # echo ALLEGRO=$ALLEGRO
flags="-q" flags="-q"
nodebug="-batch" nodebug="-batch"
if [ "$os" = windows ] && [ -z "$ALLEGRO_NOISY" ] ; then if [ "$os" = windows ] ; then
adir=$(dirname "${command}") ; adir=$(dirname "${command}") ;
allegroName=$(basename "${command}") ; allegroName=$(basename "${command}" ".exe") ;
if [[ ${allegroName: -1} == "8" ]] ; then build=build ; else build=buildi ; fi ; if [[ ${allegroName: -1} == "8" ]] ; then build=build ; else build=buildi ; fi ;
# this takes somewhat unjustifiable advantage of the fact that # this takes somewhat unjustifiable advantage of the fact that
# the Allegro images have the same name (with .dxl extension) # the Allegro images have the same name (with .dxl extension)
......
;;; -*- Lisp -*- ;;; -*- Lisp -*-
(DBG :foo (current-lisp-file-pathname)) (DBG :foo (current-lisp-file-pathname))
(unless (or #+(or allegro (and clisp os-unix) clozure cmucl (and ecl (not ecl-bytecmp)) lispworks mkcl sbcl scl) t) (unless (or #+(or allegro (and clisp os-unix) clozure cmucl
(and ecl (not ecl-bytecmp)) lispworks mkcl sbcl scl) t)
(DBG "Creating images is not supported on your CL implementation") (DBG "Creating images is not supported on your CL implementation")
(leave-test "Skipping test" 0)) (leave-test "Skipping test" 0))
...@@ -43,6 +44,7 @@ ...@@ -43,6 +44,7 @@
(lisp-invocation:invoke-lisp (lisp-invocation:invoke-lisp
:implementation-type (lisp-invocation/allegro-variants:current-lisp-variant) :implementation-type (lisp-invocation/allegro-variants:current-lisp-variant)
:cross-compile nil :cross-compile nil
:console t
:load (native-namestring (subpathname *test-directory* "make-hello-world.lisp")) :load (native-namestring (subpathname *test-directory* "make-hello-world.lisp"))
:eval (format nil "(asdf-test::make-hello-~(~a~))" kind) :eval (format nil "(asdf-test::make-hello-~(~a~))" kind)
:run-program-args :run-program-args
...@@ -70,6 +72,7 @@ ...@@ -70,6 +72,7 @@
:implementation-type (lisp-invocation/allegro-variants:current-lisp-variant) :implementation-type (lisp-invocation/allegro-variants:current-lisp-variant)
:cross-compile nil :cross-compile nil
:image-path (native-namestring img) :image-path (native-namestring img)
:console t
:eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)" :eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)"
:run-program-args '(:output :lines :error-output t))) :run-program-args '(:output :lines :error-output t)))
'("hello, world")) '("hello, world"))
...@@ -81,6 +84,7 @@ ...@@ -81,6 +84,7 @@
:implementation-type (lisp-invocation/allegro-variants:current-lisp-variant) :implementation-type (lisp-invocation/allegro-variants:current-lisp-variant)
:image-path (native-namestring img) :image-path (native-namestring img)
:cross-compile nil :cross-compile nil
:console t
:eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)" :eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)"
:arguments '("a" "b c" "d") :arguments '("a" "b c" "d")
:run-program-args '(:output :lines :error-output t)) :run-program-args '(:output :lines :error-output t))
......
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