From 405e2b37f033bb794ffe4e1204f967b04f21b4d6 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Mon, 6 Jul 2015 20:55:19 -0400 Subject: [PATCH] Update lisp-invocation to 1.0.12 to better distinguish allegro variants in test-program --- ext/closer-closer-mop | 2 +- ext/lisp-invocation | 2 +- test/run-tests.sh | 3 ++- test/test-program.script | 14 ++++---------- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ext/closer-closer-mop b/ext/closer-closer-mop index 1bd37b7d..ea8e7023 160000 --- a/ext/closer-closer-mop +++ b/ext/closer-closer-mop @@ -1 +1 @@ -Subproject commit 1bd37b7dd7671ee174f9c00a2490c00c35c3a28e +Subproject commit ea8e7023f84e247e1b96cfd8c3831741a58d2b9e diff --git a/ext/lisp-invocation b/ext/lisp-invocation index 9d1a4930..0a55ecc1 160000 --- a/ext/lisp-invocation +++ b/ext/lisp-invocation @@ -1 +1 @@ -Subproject commit 9d1a4930b4da48030bb74a80db443b6ec4254712 +Subproject commit 0a55ecc11cf564a13f443dd8916d00449b100636 diff --git a/test/run-tests.sh b/test/run-tests.sh index c46010e9..ab89f319 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -219,7 +219,8 @@ case "$lisp" in allegromodern8_64_s) command="${ALLEGROMODERN8_64_S:-mlisp8_64_s}" ;; esac # For the sake of the lisp-invocation library, re-export these - ALLEGRO=$command ; export ALLEGRO + ALLEGRO=$command ; export ALLEGRO ; + echo ALLEGRO=$ALLEGRO flags="-q" nodebug="-batch" if [ "$os" = windows ] && [ -z "$ALLEGRO_NOISY" ] ; then diff --git a/test/test-program.script b/test/test-program.script index 18e7da82..7c54fcb3 100644 --- a/test/test-program.script +++ b/test/test-program.script @@ -9,12 +9,6 @@ (trace run-program #+(and sbcl os-windows) sb-ext:run-program) -#+allegro -(defparameter *lisp* - (let ((argv0 (parse-native-namestring (first (raw-command-line-arguments))))) - (or (absolute-pathname-p argv0) - (truename (subpathname #p"sys:" argv0))))) - ;; Try to load lisp-invocation from xcvb (initialize-source-registry `(:source-registry @@ -24,7 +18,7 @@ :inherit-configuration)) (unless (find-system :lisp-invocation nil) (leave-test "Couldn't find lisp-invocation. Probably your ASDF ext/ directory needs submodule update." 1)) -(unless (version-satisfies (find-system "lisp-invocation") "1.0.11") +(unless (version-satisfies (find-system "lisp-invocation") "1.0.12") (leave-test "Lisp-invocation library isn't new enough to test successfully. Probably your ASDF ext/ directory needs submodule update." 1)) (load-system "lisp-invocation/all") ;; Disable any user source registry. @@ -35,7 +29,7 @@ 0 (nth-value 2 (lisp-invocation:invoke-lisp - #+allegro :lisp-path #+allegro *lisp* + :implementation-type (lisp-invocation/allegro-variants:current-lisp-variant) :cross-compile nil :load (native-namestring (subpathname *test-directory* "make-hello-world.lisp")) :eval (format nil "(asdf-test::make-hello-~(~a~))" kind) @@ -62,7 +56,7 @@ (nest #+lispworks (last) (lisp-invocation:invoke-lisp - #+allegro :lisp-path #+allegro *lisp* + :implementation-type (lisp-invocation/allegro-variants:current-lisp-variant) :cross-compile nil :image-path (native-namestring img) :eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)" @@ -73,7 +67,7 @@ #-(or lispworks scl) ;; These can't be passed arguments the normal way (assert-equal (lisp-invocation:invoke-lisp - #+allegro :lisp-path #+allegro *lisp* + :implementation-type (lisp-invocation/allegro-variants:current-lisp-variant) :image-path (native-namestring img) :cross-compile nil :eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)" -- GitLab