On Fri, Nov 6, 2015 at 8:07 AM, Jan Stancek <jstancek@xxxxxxxxxx> wrote: > Early RHEL6 distros like RHEL6.0 do not support "ctx" parameter, > which is causing test to fail: > Error: argument "ctx" is wrong: unknown > > Signed-off-by: Jan Stancek <jstancek@xxxxxxxxxx> > Cc: Paul Moore <paul@xxxxxxxxxxxxxx> > Cc: Stephen Smalley <sds@xxxxxxxxxxxxx> > --- > tests/inet_socket/test | 31 +++++++++++++++++++------------ > 1 file changed, 19 insertions(+), 12 deletions(-) > > diff --git a/tests/inet_socket/test b/tests/inet_socket/test > index 4deca746208c..4f6ee51cec5c 100755 > --- a/tests/inet_socket/test > +++ b/tests/inet_socket/test > @@ -1,7 +1,14 @@ > #!/usr/bin/perl > - > -use Test; > -BEGIN { plan tests => 20} > +use Test::More; > + > +BEGIN { > + # check if ip xfrm supports ctx parameter > + if (system("ip xfrm policy help 2>&1 | grep ctx") != 0) { > + plan skip_all => "ctx not supported in ip xfrm policy"; > + } else { > + plan tests => 20; > + } > +} > > $basedir = $0; $basedir =~ s|(.*)/[^/]*|$1|; > > @@ -17,7 +24,7 @@ sleep 1; # Give it a moment to initialize. > > # Verify that authorized client can communicate with the server. > $result = system "runcon -t test_inet_client_t $basedir/client stream 65535"; > -ok($result, 0); > +ok($result eq 0); My understanding of Perl is *very* basic - why this change (and the similar ones in this patch)? -- paul moore www.paul-moore.com _______________________________________________ Selinux mailing list Selinux@xxxxxxxxxxxxx To unsubscribe, send email to Selinux-leave@xxxxxxxxxxxxx. To get help, send an email containing "help" to Selinux-request@xxxxxxxxxxxxx.