summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test-suite/tests/posix.test23
1 files changed, 15 insertions, 8 deletions
diff --git a/test-suite/tests/posix.test b/test-suite/tests/posix.test
index 4dadd7784..1765206f0 100644
--- a/test-suite/tests/posix.test
+++ b/test-suite/tests/posix.test
@@ -1,7 +1,7 @@
;;;; posix.test --- Test suite for Guile POSIX functions. -*- scheme -*-
;;;;
;;;; Copyright 2003, 2004, 2006, 2007, 2010, 2012,
-;;;; 2015, 2017 Free Software Foundation, Inc.
+;;;; 2015, 2017, 2019 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -232,10 +232,17 @@
(pass-if "basic usage"
(string? (crypt "pass" "abcdefg")))
- (pass-if-exception "glibc EINVAL" exception:system-error
- ;; This used to deadlock while trying to throw to 'system-error'.
- ;; This test uses the special interpretation of the salt that glibc
- ;; does; specifically, we pass a syntactically invalid salt here.
- (if (string-contains %host-type "-gnu")
- (crypt "pass" "$X$abc") ;EINVAL
- (throw 'unresolved))))
+ (pass-if "crypt invalid salt on glibc"
+ (begin
+ (unless (string-contains %host-type "-gnu")
+ (throw 'unresolved))
+ (catch 'system-error
+ (lambda ()
+ ;; This used to deadlock on glibc while trying to throw to
+ ;; 'system-error'. This test uses the special
+ ;; interpretation of the salt that glibc does;
+ ;; specifically, we pass a salt that's probably
+ ;; syntactically invalid here. Note, whether it's invalid
+ ;; or not is system-defined, so it's possible it just works.
+ (string? (crypt "pass" "$X$abc")))
+ (lambda _ #t)))))