mirror of
git://git.yoctoproject.org/meta-selinux
synced 2026-01-01 13:58:04 +00:00
attr: fix ptest failures when selinux enabled
When selinux is enabled, a file has a default attribute "security.selinux" and the output of getfattr shows: # file: here security.selinux="system_u:object_r:lib_t:s0" That always causes more output of command getfattr than expected. Filter out selinux related attribute info, and if the file has only selinux attribute info, remove its whole output. Signed-off-by: Kai Kang <kai.kang@windriver.com>
This commit is contained in:
parent
2aadc0d5fb
commit
beaaa37217
|
|
@ -0,0 +1,41 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
When enable selinux, file has a default attribute:
|
||||
|
||||
# file: here
|
||||
security.selinux="system_u:object_r:lib_t:s0"
|
||||
|
||||
That cause there is always more output than expected.
|
||||
|
||||
Filter out selinux related attribute info to make ptest pass.
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
---
|
||||
diff --git a/test/run b/test/run
|
||||
index cf15252..945741e 100755
|
||||
--- a/test/run
|
||||
+++ b/test/run
|
||||
@@ -132,6 +132,23 @@ sub process_test($$$$) {
|
||||
print "[$prog_line] \$ ", join(' ',
|
||||
map { s/\s/\\$&/g; $_ } @$p), " -- ";
|
||||
my $result = exec_test($prog, $in);
|
||||
+
|
||||
+ # filter selinux related attributes info
|
||||
+ my @strip1;
|
||||
+ my @strip2;
|
||||
+ foreach (@$result) {
|
||||
+ unless (/security.selinux=.*\n/) {
|
||||
+ push @strip1, $_;
|
||||
+ }
|
||||
+ }
|
||||
+ for (my $i = 0; $i <= $#strip1; $i++) {
|
||||
+ if ($strip1[$i] =~ /^# file:.*/ && $strip1[$i+1] =~ /^\n$/) {
|
||||
+ $i++;
|
||||
+ } else {
|
||||
+ push @strip2, $strip1[$i];
|
||||
+ }
|
||||
+ }
|
||||
+ $result = \@strip2;
|
||||
my @good = ();
|
||||
my $nmax = (@$out > @$result) ? @$out : @$result;
|
||||
for (my $n=0; $n < $nmax; $n++) {
|
||||
5
recipes-support/attr/attr_%.bbappend
Normal file
5
recipes-support/attr/attr_%.bbappend
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
inherit selinux
|
||||
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
|
||||
|
||||
SRC_URI += "${@target_selinux(d, 'file://fix-ptest-failures-when-selinux-enabled.patch')}"
|
||||
Loading…
Reference in New Issue
Block a user