X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fforeign.test.sh;h=89f98d701b1070f841685b11170c80c6a835d97f;hb=76874d05d623e0001cfcf23d2c74f78295ba6cee;hp=0afbf39179098ee06301aef4425a0a9a78657542;hpb=416152f084604094445a758ff399871132dff2bd;p=sbcl.git

diff --git a/tests/foreign.test.sh b/tests/foreign.test.sh
index 0afbf39..89f98d7 100644
--- a/tests/foreign.test.sh
+++ b/tests/foreign.test.sh
@@ -13,17 +13,32 @@
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.
 
-testfilestem=$TMPDIR/sbcl-foreign-test-$$
+echo //entering foreign.test.sh
 
+testfilestem=${TMPDIR:-/tmp}/sbcl-foreign-test-$$
+
+# Make a little shared object file to test with.
 echo 'int summish(int x, int y) { return 1 + x + y; }' > $testfilestem.c
-make $testfilestem.o
+cc -c $testfilestem.c -o $testfilestem.o
 ld -shared -o $testfilestem.so $testfilestem.o
 
+# Test interaction with the shared object file.
 ${SBCL:-sbcl} <<EOF
-  (unless (fboundp 'load-foreign) ; not necessarily supported on all OSes..
-    (sb-ext:quit :unix-status 52)) ; successfully unsupported:-|
-  (load-foreign '("$testfilestem.so"))
-  (def-alien-routine summish int (x int) (y int))
+  (define-alien-variable environ (* c-string))
+  (defvar *environ* environ)
+  (handler-case 
+      (load-foreign '("$testfilestem.so"))
+    (sb-int:unsupported-operator ()
+     ;; At least as of sbcl-0.7.0.5, LOAD-FOREIGN 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 52))) ; success convention for Lisp program
+  ;; Test that loading an object file didn't screw up our records
+  ;; of variables visible in runtime. (This was a bug until 
+  ;; Nikodemus Siivola's patch in sbcl-0.8.5.50.)
+  (assert (= (sb-sys:sap-int (alien-sap *environ*))
+             (sb-sys:sap-int (alien-sap environ))))
+  (define-alien-routine summish int (x int) (y int))
   (assert (= (summish 10 20) 31))
   (sb-ext:quit :unix-status 52) ; success convention for Lisp program
 EOF
@@ -38,5 +53,8 @@ fi
 # rolling over in his grave.:-) It would be good to make a test case
 # for it..
 
+echo //cleanup: removing $testfilestem.*
+rm $testfilestem.*
+
 # success convention for script
-exit 104
+exit 104