From: Jim Wise <jimwise@users.sourceforge.net>
Date: Mon, 4 Apr 2011 15:28:19 +0000 (+0000)
Subject: Better Solaris support in tests:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=6b5e285152dc031327e66e5405bc449b92560ec8;p=sbcl.git

Better Solaris support in tests:

a.) support for Solaris /bin/sh in sh-based tests (`...` for $(...), and no
    test -e)

b.) Make run-compiler.sh obey $CC, if set, and teach it about Solaris
    arch support.
---

diff --git a/NEWS b/NEWS
index dc56993..135f26a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 ;;;; -*- coding: utf-8; fill-column: 78 -*-
 changes relative to sbcl-1.0.47:
+  * bug fix: better support for Solaris /bin/sh in sh-based tests.
   * enhancement: read() and write() have been added to SB-POSIX.
   * enhancement: types of DEFSTRUCT constructors are proclaimed more
     accurately, allowing better typechecking of call-sites.
diff --git a/tests/debug.impure.lisp b/tests/debug.impure.lisp
index 54bea98..d0a5ec6 100644
--- a/tests/debug.impure.lisp
+++ b/tests/debug.impure.lisp
@@ -447,7 +447,7 @@
 
 #-(and (or ppc x86 x86-64) darwin)
 (with-test (:name (trace-recursive :encapsulate nil)
-            :fails-on '(or (and :ppc (not :linux)) :sparc :mips))
+            :fails-on '(or (and :ppc (not :linux)) :sparc :mips :sunos))
   (let ((out (with-output-to-string (*trace-output*)
                (trace trace-fact :encapsulate nil)
                (assert (= 120 (trace-fact 5)))
diff --git a/tests/filesys.test.sh b/tests/filesys.test.sh
index 6840181..c91324f 100644
--- a/tests/filesys.test.sh
+++ b/tests/filesys.test.sh
@@ -278,23 +278,23 @@ run_sbcl --eval '(sb-ext:delete-directory "simple_test_subdir1")' \
          --eval '(sb-ext:delete-directory "deep" :recursive t)' \
          --eval '(sb-ext:quit)'
 
-test -e simple_test_subdir1
+test -d simple_test_subdir1
 check_status_maybe_lose "delete-directory 1" $? \
   1 "deleted"
 
-test -e simple_test_subdir2
+test -d simple_test_subdir2
 check_status_maybe_lose "delete-directory 2" $? \
   1 "deleted"
 
-test -e deep
+test -d deep
 check_status_maybe_lose "delete-directory 3" $? \
   1 "deleted"
 
-test -e dont_delete_me
+test -d dont_delete_me
 check_status_maybe_lose "delete-directory 4" $? \
   0 "didn't follow link"
 
-test -e me_neither
+test -f me_neither
 check_status_maybe_lose "delete-directory 5" $? \
   0 "didn't follow link"
 
diff --git a/tests/run-compiler.sh b/tests/run-compiler.sh
index d1a4755..d98aab0 100644
--- a/tests/run-compiler.sh
+++ b/tests/run-compiler.sh
@@ -2,14 +2,15 @@
 
 platform="${SBCL_SOFTWARE_TYPE}-${SBCL_MACHINE_TYPE}"
 
-case "$platform" in
-    SunOS-*) CC=gcc ;;
-    *) CC=cc ;;
-esac
+if [ -z "$CC" ]
+then
+    CC=cc
+fi
 
 args=
 case "$platform" in
     Darwin-X86-64) args="-arch x86_64" ;;
+    SunOS-X86-64)  args=-m64 ;;
 esac
 
 case "$platform" in
diff --git a/tests/stream.test.sh b/tests/stream.test.sh
index 3c5e38e..eed2e85 100644
--- a/tests/stream.test.sh
+++ b/tests/stream.test.sh
@@ -40,7 +40,7 @@ cat > $tmpfilename <<EOF
 EOF
 run_sbcl --disable-debugger --load $tmpfilename > $tmpfilename.out
 check_status_maybe_lose bivalent-standard-output $?
-test_output=$(cat $tmpfilename.out)
+test_output=`cat $tmpfilename.out`
 rm -f $tmpfilename.out
 if [ 'Bivalent *STANDARD-OUTPUT*' != "$test_output" ]; then
     echo "bad test output: '$test_output'"
@@ -56,7 +56,7 @@ cat > $tmpfilename <<EOF
 EOF
 run_sbcl --disable-debugger --load $tmpfilename 2> $tmpfilename.out
 check_status_maybe_lose bivalent-error-output $?
-test_output=$(cat $tmpfilename.out)
+test_output=`cat $tmpfilename.out`
 rm -f $tmpfilename.out
 if [ 'Bivalent *ERROR-OUTPUT*' != "$test_output" ]; then
     echo "bad test output: '$test_output'"
diff --git a/version.lisp-expr b/version.lisp-expr
index d713786..7c456f8 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -20,4 +20,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.47.9"
+"1.0.47.10"