From d35c5e29b6cae013aa0f4e8b075670010b9c9ce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 19 Jan 2015 15:44:12 +0100 Subject: tests: Adjust syscall tests for 2.6ish Linux. * tests/syscalls.scm ("set-network-interface-flags", "set-network-interface-address"): Accept EACCES as a valid result. --- tests/syscalls.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/syscalls.scm b/tests/syscalls.scm index 21d6637ff6..f26331e164 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014, 2015 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -91,15 +91,15 @@ (system-error-errno args))))) (test-skip (if (zero? (getuid)) 1 0)) -(test-equal "set-network-interface-flags" - EPERM +(test-assert "set-network-interface-flags" (let ((sock (socket AF_INET SOCK_STREAM 0))) (catch 'system-error (lambda () (set-network-interface-flags sock "lo" IFF_UP)) (lambda args (close-port sock) - (system-error-errno args))))) + ;; We get EPERM with Linux 3.18ish and EACCES with 2.6.32. + (memv (system-error-errno args) (list EPERM EACCES)))))) (test-equal "network-interface-address lo" (make-socket-address AF_INET (inet-pton AF_INET "127.0.0.1") 0) @@ -108,8 +108,7 @@ (close-port sock) addr)) -(test-equal "set-network-interface-address" - EPERM +(test-assert "set-network-interface-address" (let ((sock (socket AF_INET SOCK_STREAM 0))) (catch 'system-error (lambda () @@ -120,7 +119,8 @@ 0))) (lambda args (close-port sock) - (system-error-errno args))))) + ;; We get EPERM with Linux 3.18ish and EACCES with 2.6.32. + (memv (system-error-errno args) (list EPERM EACCES)))))) (test-end) -- cgit v1.2.3