From d0d3fff483379baf1f38c00415c7895b41b37df9 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 27 Apr 2012 10:55:39 +1000 Subject: - (dtucker) [regress/addrmatch.sh] skip tests when running on a non-ipv6 platform rather than exiting early, so that we still clean up and return status to test-exec.sh --- ChangeLog | 5 +++++ regress/addrmatch.sh | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7ec760c6..5eda2f27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +20120427 + - (dtucker) [regress/addrmatch.sh] skip tests when running on a non-ipv6 + platform rather than exiting early, so that we still clean up and return + success or failure to test-exec.sh + 20120426 - (djm) [auth-passwd.c] Handle crypt() returning NULL; from Paul Wouters via Niels diff --git a/regress/addrmatch.sh b/regress/addrmatch.sh index 23ddd65c..5102317d 100644 --- a/regress/addrmatch.sh +++ b/regress/addrmatch.sh @@ -33,13 +33,14 @@ run_trial user 19.0.0.1 somehost no "deny, no match" run_trial user 10.255.255.254 somehost yes "permit, list middle" run_trial user 192.168.30.1 192.168.0.1 no "deny, faked IP in hostname" run_trial user 1.1.1.1 somehost.example.com yes "permit, bare IP4 address" -test "$TEST_SSH_IPV6" = "no" && exit +if test "$TEST_SSH_IPV6" != "no"; then run_trial user ::1 somehost.example.com yes "permit, bare IP6 address" run_trial user ::2 somehost.exaple.com no "deny IPv6" run_trial user ::3 somehost no "deny IP6 negated" run_trial user ::4 somehost no "deny, IP6 no match" run_trial user 2000::1 somehost yes "permit, IP6 network" run_trial user 2001::1 somehost no "deny, IP6 network" +fi cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy rm $OBJ/sshd_proxy_bak -- cgit v1.2.3