Testsuite: split out ipv6 testcase needing a non-linklocal interface addr

1 files changed, 6 insertions, 1 deletions

diff --git a/test/runtest b/test/runtest
index be35e157f..541d62ac3 100755
--- a/test/runtest
+++ b/test/runtest
@@ -3458,7 +3458,8 @@ while (not ($parm_ipv4 and $parm_ipv6) and defined($_ = <IFCONFIG>))
     $parm_ipv4 = $1;
     }
 
-  if (not $parm_ipv6 and /^\s*inet6(?:\saddr)?:?\s?([abcdef\d:]+)(?:%[^ \/]+)?(?:\/\d+)?/i)
+  if (   (not $parm_ipv6 or $parm_ipv6 =~ /%/)
+     and /^\s*inet6(?:\saddr)?:?\s?([abcdef\d:]+)(?:%[^ \/]+)?(?:\/\d+)?/i)
     {
     next if $1 eq '::' or $1 eq '::1' or $1 =~ /^ff00/i or $1 =~ /^fe80::1/i;
     $parm_ipv6 = $1;
@@ -3827,6 +3828,10 @@ DIR: for (my $i = 0; $i < @test_dirs; $i++)
 	}
 	unlink("$parm_cwd/test-config");
         }
+      elsif (/^ipv6-non-linklocal/)
+	{
+	if ($parm_ipv6 =~ /%/) { $wantthis = 0; last; }
+	}
       else
         {
         tests_exit(-1, "Unknown line in \"scripts/$testdir/REQUIRES\": \"$_\"");