From 05854d6d554238cf3cfbe2b68e7ae8060f71b536 Mon Sep 17 00:00:00 2001 From: Gabor Melis Date: Mon, 12 Jan 2009 14:57:08 +0000 Subject: [PATCH] 1.0.24.38: improve test scripts - robustify threads.test.sh even more - fix the same bug related to $! in finalize.test.sh - make condition-wait-sigcont.lisp work unithread builds --- tests/condition-wait-sigcont.lisp | 3 +++ tests/finalize.test.sh | 3 ++- tests/threads.test.sh | 3 +-- version.lisp-expr | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/condition-wait-sigcont.lisp b/tests/condition-wait-sigcont.lisp index 35adec7..04fd5cd 100644 --- a/tests/condition-wait-sigcont.lisp +++ b/tests/condition-wait-sigcont.lisp @@ -21,7 +21,10 @@ (write-line "/waiting") (force-output) (delete-file "condition-wait-sigcont.tmp") + #+sb-thread (condition-wait *queue* *lock*) + #-sb-thread + (loop (sleep 10)) (write-line "/woken") (force-output) (with-open-file (f "condition-wait-sigcont.tmp" :direction :output) diff --git a/tests/finalize.test.sh b/tests/finalize.test.sh index e2ef1bc..ded7232 100644 --- a/tests/finalize.test.sh +++ b/tests/finalize.test.sh @@ -10,7 +10,8 @@ use_test_subdirectory echo //entering finalize.test.sh -run_sbcl < /dev/null & +# $! is not set correctly when calling run_sbcl, do it directly +"$SBCL_RUNTIME" --core "$SBCL_CORE" $SBCL_ARGS < /dev/null & (defvar *tmp* 0.0) (defvar *count* 0) diff --git a/tests/threads.test.sh b/tests/threads.test.sh index f266944..cc2de11 100644 --- a/tests/threads.test.sh +++ b/tests/threads.test.sh @@ -18,8 +18,7 @@ flag="condition-wait-sigcont.tmp" touch $flag # $! is not set correctly when calling run_sbcl, do it directly -"$SBCL_RUNTIME" --core "$SBCL_CORE" \ - --no-userinit --no-sysinit --disable-debugger \ +"$SBCL_RUNTIME" --core "$SBCL_CORE" $SBCL_ARGS \ --load "$SBCL_PWD/condition-wait-sigcont.lisp" & sb_pid=$! diff --git a/version.lisp-expr b/version.lisp-expr index ba0cdd9..7fdd6c7 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.24.37" +"1.0.24.38" -- 1.7.10.4