Commit 12503c8 sync with dist-git PR to run on rawhide

3 files Authored and Committed by rasibley 2 years ago
sync with dist-git PR to run on rawhide

    
 1 @@ -26,6 +26,7 @@
 2   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 3   
 4   # Include Beaker environment
 5 + . /usr/bin/rhts-environment.sh || exit 1
 6   . /usr/share/beakerlib/beakerlib.sh || exit 1
 7   
 8   PACKAGE="libselinux"
 9 @@ -185,7 +186,11 @@
10           rlRun "cat > $TmpDir/my_contexts <<EOF
11   $TmpDir my_user_u:my_role_r:my_type_t:s0
12   EOF"
13 -         rlRun "./test_open CTX_FILE $TmpDir/my_contexts NULL 1 0 2> >(tee output >&2)" 0
14 +         if rlIsFedora ">=27"; then
15 +             rlRun "./test_open CTX_FILE $TmpDir/my_contexts NULL 1 0 2> >(tee output >&2)" 22
16 +         else
17 +             rlRun "./test_open CTX_FILE $TmpDir/my_contexts NULL 1 0 2> >(tee output >&2)" 0
18 +         fi
19           rlRun "grep 'line 1 has invalid context my_user_u:my_role_r:my_type_t:s0' output"
20           
21           rlRun "cat > $TmpDir/my_contexts <<EOF
1 @@ -282,7 +282,7 @@
2           rlRun "grep \"\\\"$TmpDir/a/b/cfile\\\"\"   strace_xattr.out"
3   
4           # null as list
5 -         if rlIsFedora >= 26; then
6 +         if rlIsFedora ">=26"; then
7               rlRun "strace -ostrace.out -s 64 ./test_exclude_list NULL $TmpDir" 139 "Calling selinux_restorecon_set_exclude_list with null as list"
8           else
9               rlRun "strace -ostrace.out -s 64 ./test_exclude_list NULL $TmpDir" 0 "Calling selinux_restorecon_set_exclude_list with null as list"
1 @@ -10,7 +10,6 @@
2       - realpath_not_final-function
3       - selabel-functions
4       - selinux_boolean_sub-function
5 -     - selinux_restorecon
6       - selinux_sestatus-functions
7       - selinux_set_callback
8       - selinux_restorecon-functions