| Message ID | 20190918125507.10778-1-sds@tycho.nsa.gov (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | selinux-testsuite: apply perltidy to infiniband test scripts | expand |
On Wed, Sep 18, 2019 at 2:55 PM Stephen Smalley <sds@tycho.nsa.gov> wrote: > The infiniband test scripts weren't compliant with perltidy so > make check-syntax was failing. Fix it. Unfortunately there is some disconnect between the perltidy version available in the Travis CI environment and the newer versions available in more recent distributions... See this commit in the audit-testsuite [1] - the decision is to follow the Travis format as the common "standard" (there is really no better way until we patch the Travis script to install newer peritidy somehow...). Just in case you don't know, anyone can easily enable Travis CI on their GitHub fork - just go to https://travis-ci.org/, log in with your GitHub account, and switch the corresponding project to enabled. That way you can just push a branch to your fork, it will be tested and you will get a report to (just) your mailbox. I.e. you can do the canonical syntax check without opening a PR against the upstream repo. [1] https://github.com/linux-audit/audit-testsuite/commit/7ff3e434bc243e667ebb26a22b64176e662fddec > > Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> > --- > tests/infiniband_endport/test | 2 +- > tests/infiniband_pkey/test | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/infiniband_endport/test b/tests/infiniband_endport/test > index 0021e0d69af4..f071fbc18cf8 100755 > --- a/tests/infiniband_endport/test > +++ b/tests/infiniband_endport/test > @@ -40,7 +40,7 @@ ok( $result, 0 ); > > foreach (@denied_device_port) { > @dev_port_pair = split( / /, $_ ); > - $result = system > + $result = system > "runcon -t test_ibendport_manage_subnet_t smpquery PKeyTable -C $dev_port_pair[0] -P $dev_port_pair[1] -D 1 2>/dev/null"; > > if ( $result >> 8 eq 0 ) { > diff --git a/tests/infiniband_pkey/test b/tests/infiniband_pkey/test > index 3ee4d13c8ffe..382c25913ca0 100755 > --- a/tests/infiniband_pkey/test > +++ b/tests/infiniband_pkey/test > @@ -32,7 +32,7 @@ close($f); > > # The gid sysfs shows a fully expanded ipv6 address, just take the > # top half. > -@tmp = unpack( '(a20)*', $gid ); > +@tmp = unpack( '(a20)*', $gid ); > $subnet_prefix = $tmp[0] . ":"; > > @labeled_pkeys = split( /,/, $conf{SELINUX_INFINIBAND_TEST_LABELED_PKEYS} ); > -- > 2.21.0 >
On 9/19/19 3:43 AM, Ondrej Mosnacek wrote: > On Wed, Sep 18, 2019 at 2:55 PM Stephen Smalley <sds@tycho.nsa.gov> wrote: >> The infiniband test scripts weren't compliant with perltidy so >> make check-syntax was failing. Fix it. > > Unfortunately there is some disconnect between the perltidy version > available in the Travis CI environment and the newer versions > available in more recent distributions... See this commit in the > audit-testsuite [1] - the decision is to follow the Travis format as > the common "standard" (there is really no better way until we patch > the Travis script to install newer peritidy somehow...). Ok, I reverted this change. Wondering if this could be controlled through any of the perltidy options, or fixed by using a newer image e.g. bionic. > Just in case you don't know, anyone can easily enable Travis CI on > their GitHub fork - just go to https://travis-ci.org/, log in with > your GitHub account, and switch the corresponding project to enabled. > That way you can just push a branch to your fork, it will be tested > and you will get a report to (just) your mailbox. I.e. you can do the > canonical syntax check without opening a PR against the upstream repo. > > [1] https://github.com/linux-audit/audit-testsuite/commit/7ff3e434bc243e667ebb26a22b64176e662fddec > >> >> Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> >> --- >> tests/infiniband_endport/test | 2 +- >> tests/infiniband_pkey/test | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/tests/infiniband_endport/test b/tests/infiniband_endport/test >> index 0021e0d69af4..f071fbc18cf8 100755 >> --- a/tests/infiniband_endport/test >> +++ b/tests/infiniband_endport/test >> @@ -40,7 +40,7 @@ ok( $result, 0 ); >> >> foreach (@denied_device_port) { >> @dev_port_pair = split( / /, $_ ); >> - $result = system >> + $result = system >> "runcon -t test_ibendport_manage_subnet_t smpquery PKeyTable -C $dev_port_pair[0] -P $dev_port_pair[1] -D 1 2>/dev/null"; >> >> if ( $result >> 8 eq 0 ) { >> diff --git a/tests/infiniband_pkey/test b/tests/infiniband_pkey/test >> index 3ee4d13c8ffe..382c25913ca0 100755 >> --- a/tests/infiniband_pkey/test >> +++ b/tests/infiniband_pkey/test >> @@ -32,7 +32,7 @@ close($f); >> >> # The gid sysfs shows a fully expanded ipv6 address, just take the >> # top half. >> -@tmp = unpack( '(a20)*', $gid ); >> +@tmp = unpack( '(a20)*', $gid ); >> $subnet_prefix = $tmp[0] . ":"; >> >> @labeled_pkeys = split( /,/, $conf{SELINUX_INFINIBAND_TEST_LABELED_PKEYS} ); >> -- >> 2.21.0 >> >
On Thu, Sep 19, 2019 at 2:17 PM Stephen Smalley <sds@tycho.nsa.gov> wrote: > On 9/19/19 3:43 AM, Ondrej Mosnacek wrote: > > On Wed, Sep 18, 2019 at 2:55 PM Stephen Smalley <sds@tycho.nsa.gov> wrote: > >> The infiniband test scripts weren't compliant with perltidy so > >> make check-syntax was failing. Fix it. > > > > Unfortunately there is some disconnect between the perltidy version > > available in the Travis CI environment and the newer versions > > available in more recent distributions... See this commit in the > > audit-testsuite [1] - the decision is to follow the Travis format as > > the common "standard" (there is really no better way until we patch > > the Travis script to install newer peritidy somehow...). > > Ok, I reverted this change. Wondering if this could be controlled > through any of the perltidy options, or fixed by using a newer image > e.g. bionic. FWIW, I just checked and bionic is still not new enough: Passed with old perltidy syntax: https://travis-ci.org/WOnder93/selinux-testsuite/jobs/586994152 Failed with new perltidy syntax: https://travis-ci.org/WOnder93/selinux-testsuite/builds/586996059 > > > Just in case you don't know, anyone can easily enable Travis CI on > > their GitHub fork - just go to https://travis-ci.org/, log in with > > your GitHub account, and switch the corresponding project to enabled. > > That way you can just push a branch to your fork, it will be tested > > and you will get a report to (just) your mailbox. I.e. you can do the > > canonical syntax check without opening a PR against the upstream repo. > > > > [1] https://github.com/linux-audit/audit-testsuite/commit/7ff3e434bc243e667ebb26a22b64176e662fddec > > > >> > >> Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> > >> --- > >> tests/infiniband_endport/test | 2 +- > >> tests/infiniband_pkey/test | 2 +- > >> 2 files changed, 2 insertions(+), 2 deletions(-) > >> > >> diff --git a/tests/infiniband_endport/test b/tests/infiniband_endport/test > >> index 0021e0d69af4..f071fbc18cf8 100755 > >> --- a/tests/infiniband_endport/test > >> +++ b/tests/infiniband_endport/test > >> @@ -40,7 +40,7 @@ ok( $result, 0 ); > >> > >> foreach (@denied_device_port) { > >> @dev_port_pair = split( / /, $_ ); > >> - $result = system > >> + $result = system > >> "runcon -t test_ibendport_manage_subnet_t smpquery PKeyTable -C $dev_port_pair[0] -P $dev_port_pair[1] -D 1 2>/dev/null"; > >> > >> if ( $result >> 8 eq 0 ) { > >> diff --git a/tests/infiniband_pkey/test b/tests/infiniband_pkey/test > >> index 3ee4d13c8ffe..382c25913ca0 100755 > >> --- a/tests/infiniband_pkey/test > >> +++ b/tests/infiniband_pkey/test > >> @@ -32,7 +32,7 @@ close($f); > >> > >> # The gid sysfs shows a fully expanded ipv6 address, just take the > >> # top half. > >> -@tmp = unpack( '(a20)*', $gid ); > >> +@tmp = unpack( '(a20)*', $gid ); > >> $subnet_prefix = $tmp[0] . ":"; > >> > >> @labeled_pkeys = split( /,/, $conf{SELINUX_INFINIBAND_TEST_LABELED_PKEYS} ); > >> -- > >> 2.21.0 > >> > > > -- Ondrej Mosnacek <omosnace at redhat dot com> Software Engineer, Security Technologies Red Hat, Inc.
diff --git a/tests/infiniband_endport/test b/tests/infiniband_endport/test index 0021e0d69af4..f071fbc18cf8 100755 --- a/tests/infiniband_endport/test +++ b/tests/infiniband_endport/test @@ -40,7 +40,7 @@ ok( $result, 0 ); foreach (@denied_device_port) { @dev_port_pair = split( / /, $_ ); - $result = system + $result = system "runcon -t test_ibendport_manage_subnet_t smpquery PKeyTable -C $dev_port_pair[0] -P $dev_port_pair[1] -D 1 2>/dev/null"; if ( $result >> 8 eq 0 ) { diff --git a/tests/infiniband_pkey/test b/tests/infiniband_pkey/test index 3ee4d13c8ffe..382c25913ca0 100755 --- a/tests/infiniband_pkey/test +++ b/tests/infiniband_pkey/test @@ -32,7 +32,7 @@ close($f); # The gid sysfs shows a fully expanded ipv6 address, just take the # top half. -@tmp = unpack( '(a20)*', $gid ); +@tmp = unpack( '(a20)*', $gid ); $subnet_prefix = $tmp[0] . ":"; @labeled_pkeys = split( /,/, $conf{SELINUX_INFINIBAND_TEST_LABELED_PKEYS} );
The infiniband test scripts weren't compliant with perltidy so make check-syntax was failing. Fix it. Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> --- tests/infiniband_endport/test | 2 +- tests/infiniband_pkey/test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)