From: Andreas Fuchs <asf@boinkor.net>
Date: Sun, 7 Nov 2004 23:12:49 +0000 (+0000)
Subject: 0.8.16.35:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=6198ab492260b440a551e29b274bdd4ac5534dbb;p=sbcl.git

0.8.16.35:
        Fix FASL loader in the presence of foreign-datarefs on unicode

        * Make fop-foreign-dataref-fixup treat the foreign symbol as a
          BASE-CHAR string.
        * Make foreign.test.sh use a FASL file instead of a LOADed .lisp
          file.
        * Incidentally, also fix tests/foreign.test.sh, too: it returned
          success even when there was a failure in the main test.
---

diff --git a/src/code/fop.lisp b/src/code/fop.lisp
index a981179..33146bf 100644
--- a/src/code/fop.lisp
+++ b/src/code/fop.lisp
@@ -704,7 +704,7 @@ bug.~:@>")
   (let* ((kind (pop-stack))
 	 (code-object (pop-stack))
 	 (len (read-byte-arg))
-	 (sym (make-string len)))
+	 (sym (make-string len :element-type 'base-char)))
     (read-n-bytes *fasl-input-stream* sym 0 len)
     (sb!vm:fixup-code-object code-object
 			     (read-word-arg)
diff --git a/tests/foreign.test.sh b/tests/foreign.test.sh
index 593412a..9ae8a48 100644
--- a/tests/foreign.test.sh
+++ b/tests/foreign.test.sh
@@ -31,16 +31,17 @@ cc -c $testfilestem.c -o $testfilestem.o
 ld -shared -o $testfilestem.so $testfilestem.o
 
 # Foreign definitions & load
-cat > $testfilestem.deflisp <<EOF
+cat > $testfilestem.def.lisp <<EOF
   (define-alien-variable environ (* c-string))
   (defvar *environ* environ)
-  (handler-case 
-      (load-shared-object "$testfilestem.so")
-    (sb-int:unsupported-operator ()
-     ;; At least as of sbcl-0.7.0.5, LOAD-SHARED-OBJECT isn't
-     ;; supported on every OS. In that case, there's nothing to test,
-     ;; and we can just fall through to success.
-     (sb-ext:quit :unix-status 22))) ; catch that
+  (eval-when (:compile-toplevel :load-toplevel :execute)
+    (handler-case 
+        (load-shared-object "$testfilestem.so")
+      (sb-int:unsupported-operator ()
+        ;; At least as of sbcl-0.7.0.5, LOAD-SHARED-OBJECT isn't
+        ;; supported on every OS. In that case, there's nothing to test,
+        ;; and we can just fall through to success.
+        (sb-ext:quit :unix-status 22)))) ; catch that
   (define-alien-routine summish int (x int) (y int))
   (define-alien-variable numberish int)
   (define-alien-routine nummish int (x int))
@@ -56,7 +57,7 @@ cat > $testfilestem.deflisp <<EOF
 EOF
 
 # Test code
-cat > $testfilestem.testlisp <<EOF
+cat > $testfilestem.test.lisp <<EOF
   (assert (= (summish 10 20) 31))
   (assert (= 42 numberish))
   (setf numberish 13)
@@ -65,17 +66,27 @@ cat > $testfilestem.testlisp <<EOF
   (sb-ext:quit :unix-status 52) ; success convention for Lisp program
 EOF
 
-${SBCL:-sbcl} --load $testfilestem.deflisp --load $testfilestem.testlisp
-if [ $? = 22 ]; then
+${SBCL:-sbcl} --eval "(progn (compile-file #p\"$testfilestem.def.lisp\") (sb-ext:quit :unix-status 52))"
+if [ $? = 52 ] ; then :
+else
+    # we can't compile the test file. something's wrong.
+    rm $testfilestem.*
+    echo test failed: $?
+    exit 1
+fi
+
+${SBCL:-sbcl} --load $testfilestem.def.fasl --load $testfilestem.test.lisp
+RET=$?
+if [ $RET = 22 ]; then
     rm $testfilestem.*
     exit $PUNT # success -- load-shared-object not supported
-elif [ $? != 52]; then
+elif [ $RET != 52 ]; then
     rm $testfilestem.*
     echo test failed: $?
     exit 1 
 fi
 
-${SBCL:-sbcl} --load $testfilestem.deflisp --eval "(when (member :linkage-table *features*) (save-lisp-and-die \"$testfilestem.core\"))" <<EOF
+${SBCL:-sbcl} --load $testfilestem.def.fasl --eval "(when (member :linkage-table *features*) (save-lisp-and-die \"$testfilestem.core\"))" <<EOF
   (sb-ext:quit :unix-status 22) ; catch this
 EOF
 if [ $? = 22 ]; then
@@ -83,7 +94,7 @@ if [ $? = 22 ]; then
     exit $PUNT # success -- linkage-table not available
 fi
 
-$SBCL_ALLOWING_CORE --core $testfilestem.core --sysinit /dev/null --userinit /dev/null --load $testfilestem.testlisp
+$SBCL_ALLOWING_CORE --core $testfilestem.core --sysinit /dev/null --userinit /dev/null --load $testfilestem.test.lisp
 if [ $? != 52 ]; then
     rm $testfilestem.*
     echo test failed: $?
diff --git a/version.lisp-expr b/version.lisp-expr
index 9075dd3..ad5d22a 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".)
-"0.8.16.34"
+"0.8.16.35"