diff options
| author | allgdante <allan.garret@gmail.com> | 2018-01-26 11:09:38 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-13 15:33:55 +0000 |
| commit | ad8994e692705cfffed1c2ec14070b7b6ce85de9 (patch) | |
| tree | ff3d65b3bd20a240e4c370239e3b9a86afcdf96c /testing/apparmor/0005-Remove-parser-test-against-rttime.patch | |
| parent | eec0dec579994a499def4c1ab349672b8404b80b (diff) | |
| download | aports-ad8994e692705cfffed1c2ec14070b7b6ce85de9.tar.bz2 aports-ad8994e692705cfffed1c2ec14070b7b6ce85de9.tar.xz | |
testing/apparmor: upgrade to 2.12
Diffstat (limited to 'testing/apparmor/0005-Remove-parser-test-against-rttime.patch')
| -rw-r--r-- | testing/apparmor/0005-Remove-parser-test-against-rttime.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/testing/apparmor/0005-Remove-parser-test-against-rttime.patch b/testing/apparmor/0005-Remove-parser-test-against-rttime.patch new file mode 100644 index 0000000000..5d9f2450f3 --- /dev/null +++ b/testing/apparmor/0005-Remove-parser-test-against-rttime.patch @@ -0,0 +1,58 @@ +diff --git a/parser/tst/equality.sh b/parser/tst/equality.sh +index 029eec46..3b2f0f9f 100755 +--- a/parser/tst/equality.sh ++++ b/parser/tst/equality.sh +@@ -525,15 +525,15 @@ verify_binary_equality "@{profile_name} is literal in peer with esc alt sequence + + + # verify rlimit data conversions +-verify_binary_equality "set rlimit rttime <= 12 weeks" \ +- "/t { set rlimit rttime <= 12 weeks, }" \ +- "/t { set rlimit rttime <= $((12 * 7)) days, }" \ +- "/t { set rlimit rttime <= $((12 * 7 * 24)) hours, }" \ +- "/t { set rlimit rttime <= $((12 * 7 * 24 * 60)) minutes, }" \ +- "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60)) seconds, }" \ +- "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60 * 1000)) ms, }" \ +- "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60 * 1000 * 1000)) us, }" \ +- "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60 * 1000 * 1000)), }" ++#verify_binary_equality "set rlimit rttime <= 12 weeks" \ ++# "/t { set rlimit rttime <= 12 weeks, }" \ ++# "/t { set rlimit rttime <= $((12 * 7)) days, }" \ ++# "/t { set rlimit rttime <= $((12 * 7 * 24)) hours, }" \ ++# "/t { set rlimit rttime <= $((12 * 7 * 24 * 60)) minutes, }" \ ++# "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60)) seconds, }" \ ++# "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60 * 1000)) ms, }" \ ++# "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60 * 1000 * 1000)) us, }" \ ++# "/t { set rlimit rttime <= $((12 * 7 * 24 * 60 * 60 * 1000 * 1000)), }" + + verify_binary_equality "set rlimit cpu <= 42 weeks" \ + "/t { set rlimit cpu <= 42 weeks, }" \ +diff --git a/parser/tst/simple_tests/rlimits/ok_rlimit_13.sd b/parser/tst/simple_tests/rlimits/ok_rlimit_13.sd +deleted file mode 100644 +index 50b9a6f3..00000000 +--- a/parser/tst/simple_tests/rlimits/ok_rlimit_13.sd ++++ /dev/null +@@ -1,7 +0,0 @@ +-# +-#=DESCRIPTION simple rttime rlimit allows default units +-#=EXRESULT PASS +- +-profile rlimit { +- set rlimit rttime <= 12, +-} +diff --git a/parser/tst/simple_tests/rlimits/ok_rlimit_18.sd b/parser/tst/simple_tests/rlimits/ok_rlimit_18.sd +deleted file mode 100644 +index f2747f10..00000000 +--- a/parser/tst/simple_tests/rlimits/ok_rlimit_18.sd ++++ /dev/null +@@ -1,7 +0,0 @@ +-# +-#=DESCRIPTION simple realtime time rlimit test +-#=EXRESULT PASS +- +-profile rlimit { +- set rlimit rttime <= 60minutes, +-} +-- +2.16.1 + |