diff options
| author | Mark H Weaver <mhw@netris.org> | 2013-07-16 01:33:27 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2013-07-16 01:33:27 -0400 |
| commit | 28d5d2537c0321643c3b511a2195cd491204e7f2 (patch) | |
| tree | 16b46ded431848672722595b87024fb7ffc48142 /test-suite/tests/foreign.test | |
| parent | 178a40928ab5221f6ce57c5af1067abe30a342b3 (diff) | |
| parent | 95ed221785f5b1203e998823455f682c1830498b (diff) | |
| download | guile-28d5d2537c0321643c3b511a2195cd491204e7f2.tar.gz | |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/keywords.c
libguile/vm.c
Diffstat (limited to 'test-suite/tests/foreign.test')
| -rw-r--r-- | test-suite/tests/foreign.test | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/test-suite/tests/foreign.test b/test-suite/tests/foreign.test index 9d615ce16..74cdc1b4f 100644 --- a/test-suite/tests/foreign.test +++ b/test-suite/tests/foreign.test @@ -224,9 +224,13 @@ (define qsort ;; Bindings for libc's `qsort' function. - (pointer->procedure void - (dynamic-func "qsort" (dynamic-link)) - (list '* size_t size_t '*))) + ;; On some platforms, such as MinGW, `qsort' is visible only if + ;; linking with `-export-dynamic'. Just skip these tests when it's + ;; not visible. + (false-if-exception + (pointer->procedure void + (dynamic-func "qsort" (dynamic-link)) + (list '* size_t size_t '*)))) (define (dereference-pointer-to-byte ptr) (let ((b (pointer->bytevector ptr 1))) @@ -236,7 +240,7 @@ '(7 1 127 3 5 4 77 2 9 0)) (pass-if "qsort" - (if (defined? 'procedure->pointer) + (if (and qsort (defined? 'procedure->pointer)) (let* ((called? #f) (cmp (lambda (x y) (set! called? #t) @@ -254,7 +258,7 @@ (pass-if-exception "qsort, wrong return type" exception:wrong-type-arg - (if (defined? 'procedure->pointer) + (if (and qsort (defined? 'procedure->pointer)) (let* ((cmp (lambda (x y) #f)) ; wrong return type (ptr (procedure->pointer int cmp (list '* '*))) (bv (u8-list->bytevector input))) @@ -266,7 +270,7 @@ (pass-if-exception "qsort, wrong arity" exception:wrong-num-args - (if (defined? 'procedure->pointer) + (if (and qsort (defined? 'procedure->pointer)) (let* ((cmp (lambda (x y z) #f)) ; wrong arity (ptr (procedure->pointer int cmp (list '* '*))) (bv (u8-list->bytevector input))) |