diff options
author | Mark H Weaver <mhw@netris.org> | 2013-08-11 22:46:22 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2013-08-11 22:46:22 -0400 |
commit | 1160e2d94e6a53e4509f81ff08798655db9cae26 (patch) | |
tree | 01885df852779fe22ca336082e033dfbff6f5c6e /test-suite/tests | |
parent | 1e5c32054e002e2c12ba0188b58b7d26432c3495 (diff) | |
parent | 9ea816f54a3cc2216eac45c6238fa06448d824df (diff) | |
download | guile-1160e2d94e6a53e4509f81ff08798655db9cae26.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Diffstat (limited to 'test-suite/tests')
-rw-r--r-- | test-suite/tests/foreign.test | 4 | ||||
-rw-r--r-- | test-suite/tests/i18n.test | 10 | ||||
-rw-r--r-- | test-suite/tests/numbers.test | 94 | ||||
-rw-r--r-- | test-suite/tests/r6rs-arithmetic-flonums.test | 2 |
4 files changed, 49 insertions, 61 deletions
diff --git a/test-suite/tests/foreign.test b/test-suite/tests/foreign.test index 74cdc1b4f..8ba989e4d 100644 --- a/test-suite/tests/foreign.test +++ b/test-suite/tests/foreign.test @@ -51,6 +51,10 @@ (pass-if "null-pointer? %null-pointer" (null-pointer? %null-pointer)) + (pass-if-exception "dereference-pointer %null-pointer" + exception:null-pointer-error + (dereference-pointer %null-pointer)) + (pass-if-exception "pointer->bytevector %null-pointer" exception:null-pointer-error (pointer->bytevector %null-pointer 7))) diff --git a/test-suite/tests/i18n.test b/test-suite/tests/i18n.test index ad65b73f0..b980cdcdb 100644 --- a/test-suite/tests/i18n.test +++ b/test-suite/tests/i18n.test @@ -1,6 +1,7 @@ ;;;; i18n.test --- Exercise the i18n API. -*- coding: utf-8; mode: scheme; -*- ;;;; -;;;; Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +;;;; Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012, +;;;; 2013 Free Software Foundation, Inc. ;;;; Ludovic Courtès ;;;; ;;;; This library is free software; you can redistribute it and/or @@ -147,10 +148,11 @@ (under-locale-or-unresolved %french-utf8-locale thunk)) (define (under-turkish-utf8-locale-or-unresolved thunk) - ;; FreeBSD 8.2, Solaris 2.10, and Darwin 8.11.0 have a broken tr_TR - ;; locale where `i' is mapped to uppercase `I' instead of `İ', so - ;; disable tests on that platform. + ;; FreeBSD 8.2 and 9.1, Solaris 2.10, and Darwin 8.11.0 have a broken + ;; tr_TR locale where `i' is mapped to uppercase `I' instead of `İ', + ;; so disable tests on that platform. (if (or (string-contains %host-type "freebsd8") + (string-contains %host-type "freebsd9") (string-contains %host-type "solaris2.10") (string-contains %host-type "darwin8")) (throw 'unresolved) diff --git a/test-suite/tests/numbers.test b/test-suite/tests/numbers.test index ffbbea26f..68f8f91a7 100644 --- a/test-suite/tests/numbers.test +++ b/test-suite/tests/numbers.test @@ -1079,68 +1079,50 @@ ;;; (with-test-prefix "numerator" - (pass-if "0" - (eqv? 0 (numerator 0))) - (pass-if "1" - (eqv? 1 (numerator 1))) - (pass-if "2" - (eqv? 2 (numerator 2))) - (pass-if "-1" - (eqv? -1 (numerator -1))) - (pass-if "-2" - (eqv? -2 (numerator -2))) - - (pass-if "0.0" - (eqv? 0.0 (numerator 0.0))) - (pass-if "1.0" - (eqv? 1.0 (numerator 1.0))) - (pass-if "2.0" - (eqv? 2.0 (numerator 2.0))) - (pass-if "-1.0" - (eqv? -1.0 (numerator -1.0))) - (pass-if "-2.0" - (eqv? -2.0 (numerator -2.0))) - - (pass-if "0.5" - (eqv? 1.0 (numerator 0.5))) - (pass-if "0.25" - (eqv? 1.0 (numerator 0.25))) - (pass-if "0.75" - (eqv? 3.0 (numerator 0.75)))) + (pass-if-equal "0" 0 (numerator 0)) + (pass-if-equal "1" 1 (numerator 1)) + (pass-if-equal "2" 2 (numerator 2)) + (pass-if-equal "-1" -1 (numerator -1)) + (pass-if-equal "-2" -2 (numerator -2)) + + (pass-if-equal "0.0" 0.0 (numerator 0.0)) + (pass-if-equal "1.0" 1.0 (numerator 1.0)) + (pass-if-equal "2.0" 2.0 (numerator 2.0)) + (pass-if-equal "-0.0" -0.0 (numerator -0.0)) + (pass-if-equal "-1.0" -1.0 (numerator -1.0)) + (pass-if-equal "-2.0" -2.0 (numerator -2.0)) + + (pass-if-equal "0.5" 1.0 (numerator 0.5)) + (pass-if-equal "0.25" 1.0 (numerator 0.25)) + (pass-if-equal "0.75" 3.0 (numerator 0.75)) + + (pass-if-equal "+inf.0" +inf.0 (numerator +inf.0)) + (pass-if-equal "-inf.0" -inf.0 (numerator -inf.0))) ;;; ;;; denominator ;;; (with-test-prefix "denominator" - (pass-if "0" - (eqv? 1 (denominator 0))) - (pass-if "1" - (eqv? 1 (denominator 1))) - (pass-if "2" - (eqv? 1 (denominator 2))) - (pass-if "-1" - (eqv? 1 (denominator -1))) - (pass-if "-2" - (eqv? 1 (denominator -2))) - - (pass-if "0.0" - (eqv? 1.0 (denominator 0.0))) - (pass-if "1.0" - (eqv? 1.0 (denominator 1.0))) - (pass-if "2.0" - (eqv? 1.0 (denominator 2.0))) - (pass-if "-1.0" - (eqv? 1.0 (denominator -1.0))) - (pass-if "-2.0" - (eqv? 1.0 (denominator -2.0))) - - (pass-if "0.5" - (eqv? 2.0 (denominator 0.5))) - (pass-if "0.25" - (eqv? 4.0 (denominator 0.25))) - (pass-if "0.75" - (eqv? 4.0 (denominator 0.75)))) + (pass-if-equal "0" 1 (denominator 0)) + (pass-if-equal "1" 1 (denominator 1)) + (pass-if-equal "2" 1 (denominator 2)) + (pass-if-equal "-1" 1 (denominator -1)) + (pass-if-equal "-2" 1 (denominator -2)) + + (pass-if-equal "0.0" 1.0 (denominator 0.0)) + (pass-if-equal "1.0" 1.0 (denominator 1.0)) + (pass-if-equal "2.0" 1.0 (denominator 2.0)) + (pass-if-equal "-0.0" 1.0 (denominator -0.0)) + (pass-if-equal "-1.0" 1.0 (denominator -1.0)) + (pass-if-equal "-2.0" 1.0 (denominator -2.0)) + + (pass-if-equal "0.5" 2.0 (denominator 0.5)) + (pass-if-equal "0.25" 4.0 (denominator 0.25)) + (pass-if-equal "0.75" 4.0 (denominator 0.75)) + + (pass-if-equal "+inf.0" 1.0 (denominator +inf.0)) + (pass-if-equal "-inf.0" 1.0 (denominator -inf.0))) ;;; ;;; gcd diff --git a/test-suite/tests/r6rs-arithmetic-flonums.test b/test-suite/tests/r6rs-arithmetic-flonums.test index ea425e3dc..c90184daa 100644 --- a/test-suite/tests/r6rs-arithmetic-flonums.test +++ b/test-suite/tests/r6rs-arithmetic-flonums.test @@ -218,7 +218,7 @@ (and (fl=? (flnumerator +inf.0) +inf.0) (fl=? (flnumerator -inf.0) -inf.0))) - (pass-if "negative zero" (fl=? (flnumerator -0.0) -0.0))) + (pass-if "negative zero" (eqv? (flnumerator -0.0) -0.0))) (with-test-prefix "fldenominator" (pass-if "simple" (fl=? (fldenominator 0.5) 2.0)) |