X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fforeign.test.sh;h=10bc61378ea11b8520052ea48a794a10ce48e661;hb=b9a60d8c091096ce7f90073de9b3d26ec7433387;hp=6b5a7cd243c903400ef9e8a4d619786309fc0411;hpb=9514c25e89aad10784c6d04fea4595d8c8ae68cc;p=sbcl.git

diff --git a/tests/foreign.test.sh b/tests/foreign.test.sh
index 6b5a7cd..10bc613 100644
--- a/tests/foreign.test.sh
+++ b/tests/foreign.test.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# tests related to foreign function interface and LOAD-FOREIGN
+# tests related to foreign function interface and loading of shared
+# libraries
 
 # This software is part of the SBCL system. See the README file for
 # more information.
@@ -13,17 +14,32 @@
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.
 
+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-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 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
@@ -32,13 +48,8 @@ if [ $? != 52 ]; then
     exit 1
 fi
 
-# FIXME: I rewrote the handling of ENV/ENVIRONMENT arguments for
-# LOAD-FOREIGN, but I can't think of a nice way to test it. (Kent Beck
-# would cry. If he didn't keel over on the spot and then commence
-# 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