X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fforeign.test.sh;h=bd91bfe5dd3db4d8214a628adec40ab05061aa24;hb=c3334d2307b721cfcea29e6abcd33e48487fb1ea;hp=ac7ebcc296824f51b1959df62ef994c062a0434a;hpb=75b52379bdc2269961af6a1308eca63610f38ac3;p=sbcl.git

diff --git a/tests/foreign.test.sh b/tests/foreign.test.sh
index ac7ebcc..bd91bfe 100644
--- a/tests/foreign.test.sh
+++ b/tests/foreign.test.sh
@@ -23,27 +23,54 @@ PUNT=104
 
 testfilestem=${TMPDIR:-/tmp}/sbcl-foreign-test-$$
 
-# Make a little shared object file to test with.
+## Make a little shared object files to test with.
+
+build_so() {
+  echo building $1.so
+  if [ $(uname -p) = x86_64 ]; then
+    CFLAGS="$CFLAGS -fPIC"
+  fi
+  cc -c $1.c -o $1.o $CFLAGS
+  ld -shared -o $1.so $1.o
+}
+    
 echo 'int summish(int x, int y) { return 1 + x + y; }' > $testfilestem.c
 echo 'int numberish = 42;' >> $testfilestem.c
 echo 'int nummish(int x) { return numberish + x; }' >> $testfilestem.c
-cc -c $testfilestem.c -o $testfilestem.o
-ld -shared -o $testfilestem.so $testfilestem.o
+build_so $testfilestem
+
+echo 'int foo = 13;' > $testfilestem-b.c
+echo 'int bar() { return 42; }' >> $testfilestem-b.c
+build_so $testfilestem-b
+
+echo 'int foo = 42;' > $testfilestem-b2.c
+echo 'int bar() { return 13; }' >> $testfilestem-b2.c
+build_so $testfilestem-b2
+
+echo 'int late_foo = 43;' > $testfilestem-c.c
+echo 'int late_bar() { return 14; }' >> $testfilestem-c.c
+build_so $testfilestem-c
 
-# Foreign definitions & load
-cat > $testfilestem.deflisp <<EOF
+## Foreign definitions & load
+
+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
+        (progn
+          (load-shared-object "$testfilestem.so")
+          (load-shared-object "$testfilestem-b.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))
+  (define-alien-variable "foo" int)
+  (define-alien-routine "bar" int)
 
   ;; Test that loading an object file didn't screw up our records
   ;; of variables visible in runtime. (This was a bug until 
@@ -53,29 +80,84 @@ cat > $testfilestem.deflisp <<EOF
   ;; that the location will be the same.
   (assert (= (sb-sys:sap-int (alien-sap *environ*))
              (sb-sys:sap-int (alien-sap environ))))
+
+  ;; automagic restarts
+  (setf *debugger-hook* 
+        (lambda (condition hook)
+          (print (list :debugger-hook condition))
+          (let ((cont (find-restart 'continue condition)))
+            (when cont 
+              (invoke-restart cont)))
+          (print :fell-through)
+          (invoke-debugger condition)))
 EOF
 
 # Test code
-cat > $testfilestem.testlisp <<EOF
+cat > $testfilestem.test.lisp <<EOF
   (assert (= (summish 10 20) 31))
   (assert (= 42 numberish))
   (setf numberish 13)
   (assert (= 13 numberish))
   (assert (= 14 (nummish 1)))
+
+  (print :stage-1)
+
+  ;; test realoading object file with new definitions
+  (assert (= 13 foo))
+  (assert (= 42 (bar)))
+  (rename-file "$testfilestem-b.so" "$testfilestem-b.bak")
+  (rename-file "$testfilestem-b2.so" "$testfilestem-b.so")
+  (load-shared-object "$testfilestem-b.so")
+  (assert (= 42 foo))
+  (assert (= 13 (bar)))
+  (rename-file "$testfilestem-b.so" "$testfilestem-b2.so")
+  (rename-file "$testfilestem-b.bak" "$testfilestem-b.so")
+
+  (print :stage-2)
+
+  ;; test late resolution
+  (define-alien-variable late-foo int)
+  (define-alien-routine late-bar int)
+  (multiple-value-bind (val err) (ignore-errors late-foo)
+    (assert (not val))
+    (assert (typep err 'undefined-alien-error)))
+  (multiple-value-bind (val err) (ignore-errors (late-bar))
+    (assert (not val))
+    (assert (typep err 'undefined-alien-error)))
+  (load-shared-object "$testfilestem-c.so")
+  (assert (= 43 late-foo))
+  (assert (= 14 (late-bar)))
+
+  (print :stage-3)
+
   (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
+
+echo compile ok
+
+${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
+echo load ok
+
+${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,13 +165,37 @@ if [ $? = 22 ]; then
     exit $PUNT # success -- linkage-table not available
 fi
 
-$SBCL_ALLOWING_CORE --core $testfilestem.core --load $testfilestem.testlisp
+echo table ok
+
+$SBCL_ALLOWING_CORE --core $testfilestem.core --sysinit /dev/null --userinit /dev/null --load $testfilestem.test.lisp
+if [ $? != 52 ]; then
+    rm $testfilestem.*
+    echo test failed: $?
+    exit 1 # Failure
+fi
+
+echo start ok
+
+# missing object file
+rm $testfilestem-b.so $testfilestem-b2.so
+$SBCL_ALLOWING_CORE --core $testfilestem.core --sysinit /dev/null --userinit /dev/null <<EOF
+  (assert (= 22 (summish 10 11)))
+  (multiple-value-bind (val err) (ignore-errors (eval 'foo))
+    (assert (not val))
+    (assert (typep err 'undefined-alien-error)))
+  (multiple-value-bind (val err) (ignore-errors (eval '(bar)))
+    (assert (not val))
+    (assert (typep err 'undefined-alien-error)))
+  (quit :unix-status 52)
+EOF
 if [ $? != 52 ]; then
     rm $testfilestem.*
     echo test failed: $?
     exit 1 # Failure
 fi
 
+echo missing ok
+
 rm $testfilestem.*
 
 # success convention for script