mirror of
git://git.code.sf.net/p/sbcl/sbcl
synced 2026-09-10 07:26:40 -04:00
Remove devious hack from run-tests.lisp
It took me far too long to discover why 'foreign.test.sh' would fail
when manually run yet never caused failure of the test suite.
I blame myself for thinking this was a good approach in rev 039cfeb4
This commit is contained in:
parent
28e02f7285
commit
dc546342c2
|
|
@ -13,6 +13,9 @@
|
||||||
|
|
||||||
. ./subr.sh
|
. ./subr.sh
|
||||||
|
|
||||||
|
run_sbcl --eval '(exit :code (or #+unix 0 2))'
|
||||||
|
if [ $? -eq 2 ] ; then echo $0: SKIPPING ; exit $EXIT_TEST_WIN ; fi
|
||||||
|
|
||||||
use_test_subdirectory
|
use_test_subdirectory
|
||||||
testdir="`pwd -P`" # resolve symbolic links in the directory.
|
testdir="`pwd -P`" # resolve symbolic links in the directory.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,10 @@
|
||||||
set -e
|
|
||||||
|
|
||||||
. ./subr.sh
|
. ./subr.sh
|
||||||
|
|
||||||
|
run_sbcl --eval '(exit :code (or #+unix 0 2))'
|
||||||
|
if [ $? -eq 2 ] ; then echo $0: SKIPPING ; exit $EXIT_TEST_WIN ; fi
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
# run-sbcl.sh's pathname munging turns out always to have been
|
# run-sbcl.sh's pathname munging turns out always to have been
|
||||||
# insufficient in one way or another.
|
# insufficient in one way or another.
|
||||||
test_run_sbcl() (
|
test_run_sbcl() (
|
||||||
|
|
|
||||||
|
|
@ -658,21 +658,4 @@
|
||||||
(filter-test-files "*.impure-cload.lisp"))
|
(filter-test-files "*.impure-cload.lisp"))
|
||||||
|
|
||||||
(defun sh-files ()
|
(defun sh-files ()
|
||||||
(let ((result (filter-test-files "*.test.sh")))
|
(filter-test-files "*.test.sh"))
|
||||||
#+unix result
|
|
||||||
;; Rather than hack up the shell scripts which don't pass on #-unix
|
|
||||||
;; (which would require at least a few lines of shell script and lisp
|
|
||||||
;; to invoke SBCL and exit with some other code), just confine the kludge
|
|
||||||
;; to this file.
|
|
||||||
#-unix
|
|
||||||
(if *explicit-test-files*
|
|
||||||
result
|
|
||||||
(remove-if
|
|
||||||
(lambda (x)
|
|
||||||
(member (pathname-name x)
|
|
||||||
'("filesys.test" ; too many assertions about symlinks to care about just yet
|
|
||||||
;; No built SBCL here (.../tests/run-sbcl-test-5863): run 'sh make.sh' first!
|
|
||||||
"run-sbcl.test"
|
|
||||||
"side-effectful-pathnames.test") ; no idea
|
|
||||||
:test 'string=))
|
|
||||||
result))))
|
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,9 @@
|
||||||
|
|
||||||
. ./subr.sh
|
. ./subr.sh
|
||||||
|
|
||||||
|
run_sbcl --eval '(exit :code (or #+unix 0 2))'
|
||||||
|
if [ $? -eq 2 ] ; then echo $0: SKIPPING ; exit $EXIT_TEST_WIN ; fi
|
||||||
|
|
||||||
use_test_subdirectory
|
use_test_subdirectory
|
||||||
testdir="`pwd -P`" # resolve symbolic links in the directory.
|
testdir="`pwd -P`" # resolve symbolic links in the directory.
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue