diff options
author | Darren Tucker <dtucker@zip.com.au> | 2012-04-27 10:55:39 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2012-04-27 10:55:39 +1000 |
commit | d0d3fff483379baf1f38c00415c7895b41b37df9 (patch) | |
tree | fb74459d7029585f52a5e0ccb35f843cb9c44837 /regress/addrmatch.sh | |
parent | 025bfd11d987b62ecfe3283acfd21933222d4330 (diff) |
- (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
Diffstat (limited to 'regress/addrmatch.sh')
-rw-r--r-- | regress/addrmatch.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/regress/addrmatch.sh b/regress/addrmatch.sh index 23ddd65ce..5102317df 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" | |||
33 | run_trial user 10.255.255.254 somehost yes "permit, list middle" | 33 | run_trial user 10.255.255.254 somehost yes "permit, list middle" |
34 | run_trial user 192.168.30.1 192.168.0.1 no "deny, faked IP in hostname" | 34 | run_trial user 192.168.30.1 192.168.0.1 no "deny, faked IP in hostname" |
35 | run_trial user 1.1.1.1 somehost.example.com yes "permit, bare IP4 address" | 35 | run_trial user 1.1.1.1 somehost.example.com yes "permit, bare IP4 address" |
36 | test "$TEST_SSH_IPV6" = "no" && exit | 36 | if test "$TEST_SSH_IPV6" != "no"; then |
37 | run_trial user ::1 somehost.example.com yes "permit, bare IP6 address" | 37 | run_trial user ::1 somehost.example.com yes "permit, bare IP6 address" |
38 | run_trial user ::2 somehost.exaple.com no "deny IPv6" | 38 | run_trial user ::2 somehost.exaple.com no "deny IPv6" |
39 | run_trial user ::3 somehost no "deny IP6 negated" | 39 | run_trial user ::3 somehost no "deny IP6 negated" |
40 | run_trial user ::4 somehost no "deny, IP6 no match" | 40 | run_trial user ::4 somehost no "deny, IP6 no match" |
41 | run_trial user 2000::1 somehost yes "permit, IP6 network" | 41 | run_trial user 2000::1 somehost yes "permit, IP6 network" |
42 | run_trial user 2001::1 somehost no "deny, IP6 network" | 42 | run_trial user 2001::1 somehost no "deny, IP6 network" |
43 | fi | ||
43 | 44 | ||
44 | cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy | 45 | cp $OBJ/sshd_proxy_bak $OBJ/sshd_proxy |
45 | rm $OBJ/sshd_proxy_bak | 46 | rm $OBJ/sshd_proxy_bak |