mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-21 18:25:41 +03:00
73 lines
3.3 KiB
Diff
73 lines
3.3 KiB
Diff
From 3e78593208264935ed2589d784cbcb69f750c274 Mon Sep 17 00:00:00 2001
|
|
From: allgdante <allan.garret@gmail.com>
|
|
Date: Wed, 4 Jul 2018 17:05:10 +0200
|
|
Subject: [PATCH 3/7] parser: remove specific tests for rttime
|
|
|
|
musl libc doesn't implement this feature, so the tests fail.
|
|
We must find a way to skip those tests instead of removing them
|
|
---
|
|
parser/tst/equality.sh | 18 +++++++++---------
|
|
.../tst/simple_tests/rlimits/ok_rlimit_13.sd | 7 -------
|
|
.../tst/simple_tests/rlimits/ok_rlimit_18.sd | 7 -------
|
|
3 files changed, 9 insertions(+), 23 deletions(-)
|
|
delete mode 100644 parser/tst/simple_tests/rlimits/ok_rlimit_13.sd
|
|
delete mode 100644 parser/tst/simple_tests/rlimits/ok_rlimit_18.sd
|
|
|
|
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.20.1
|
|
|