[tests/selinux] pr775-checkpolicy-revdeps: selinux-testsuite: bump upstream commit ref

[tests/selinux] pr775-checkpolicy-revdeps: selinux-testsuite: bump upstream commit ref

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 824ac3234f3a7a3ab62a097f457a033123f663dd
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2019-12-22T15:14:49+01:00
            Stats  : +15/-2 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/824ac3234f3a7a3ab62a097f457a033123f663dd?branch=pr775-checkpolicy-revdeps

            Log:
            selinux-testsuite: bump upstream commit ref

This adds three new tests: tun_tap, socketpair, and perf.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index d866b92..65bbd78 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -36,13 +36,13 @@ PACKAGE="selinux-policy"
 # This should be updated as needed after verifying that the new version
 # doesn't break testing and after applying all necessary tweaks in the TC.
 # Run with GIT_BRANCH=master to run the latest upstream version.
-DEFAULT_COMMIT="b03e3453786cb20a16546d7743d31e5f26bfda3d"
+DEFAULT_COMMIT="2c0d0fc2491ebcd3b767eb74b6802f1c411aa0b7"
 # Default pull requests to merge before running the test.
 # If non-empty, then after checking out GIT_BRANCH the listed upstream pull
 # requests (by number) are merged, creating a new temporary local branch.
 DEFAULT_PULLS=""
 # Default SELinux Patchwork series to apply before running the test.
-DEFAULT_PATCHES="208221 207155"
+DEFAULT_PATCHES=""
 
 # Optional test parameter - location of testuite git.
 GIT_URL=${GIT_URL:-"git://github.com/SELinuxProject/selinux-testsuite"}
@@ -268,6 +268,19 @@ rlJournalStart
                     "Enable verbose output"
             fi
 
+            {
+                echo "#ifndef IFF_NAPI"
+                echo "#define IFF_NAPI 0x0010"
+                echo "#endif"
+                echo "#ifndef IFF_NAPI_FRAGS"
+                echo "#define IFF_NAPI_FRAGS 0x0020"
+                echo "#endif"
+                echo "#ifndef IFF_NO_PI"
+                echo "#define IFF_NO_PI 0x1000"
+                echo "#endif"
+            } | rlRun "tee -a tests/tun_tap/tun_common.h" 0 \
+                "Harden tun_tap test against missing defs"
+
             exclude_tests=""
             for file in ./tests/nnp*/execnnp.c; do
                 rlRun "sed -i 's/3.18/3.9/' $file" 0 \

[tests/selinux] pr775-checkpolicy-revdeps: selinux-testsuite: bump upstream commit ref

[Ondrej Mosnacek]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : a0b957b7d7554175f70175ebc6d502c0916cc57f
            Author : Ondrej Mosnacek <omosnace@redhat.com>
            Date   : 2020-01-14T13:01:40+01:00
            Stats  : +1/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/a0b957b7d7554175f70175ebc6d502c0916cc57f?branch=pr775-checkpolicy-revdeps

            Log:
            selinux-testsuite: bump upstream commit ref

The only significant change that this pulls in is 7fd02b152f9f
("tests/prlimit: avoid invalid limit combinations"), which fixes false
test failures in some environments.

Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>

---
diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh
index a2c794a..3a9680e 100755
--- a/kernel/selinux-testsuite/runtest.sh
+++ b/kernel/selinux-testsuite/runtest.sh
@@ -36,7 +36,7 @@ PACKAGE="selinux-policy"
 # This should be updated as needed after verifying that the new version
 # doesn't break testing and after applying all necessary tweaks in the TC.
 # Run with GIT_BRANCH=master to run the latest upstream version.
-DEFAULT_COMMIT="2c0d0fc2491ebcd3b767eb74b6802f1c411aa0b7"
+DEFAULT_COMMIT="7fd02b152f9f081298c676688a382d905aafb9fc"
 # Default pull requests to merge before running the test.
 # If non-empty, then after checking out GIT_BRANCH the listed upstream pull
 # requests (by number) are merged, creating a new temporary local branch.