summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Johansson <erik@ejohansson.se>2019-07-09 16:38:38 +0200
committerMilian Wolff <milian.wolff@kdab.com>2019-08-13 12:02:17 +0000
commit30ffb1503a09ff779d6825f8df45a6528a050eeb (patch)
treed9f33fce98d614edb1f697e8a9215965191c4049
parent1bc09551fd232225855749437977590b6bad7d15 (diff)
Fix unittest failure when perf_event_paranoid != -1
The test seems to pass for -1, 0 and 1 but fail when perf_event_paranoid == 2. Thus change the condition to only expect failure when the value is > 1. Change-Id: I3d2af01860366552b437b219e451d2bc7f66bcd9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r--tests/auto/kallsyms/tst_kallsyms.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/kallsyms/tst_kallsyms.cpp b/tests/auto/kallsyms/tst_kallsyms.cpp
index 416390e..d8e5fcb 100644
--- a/tests/auto/kallsyms/tst_kallsyms.cpp
+++ b/tests/auto/kallsyms/tst_kallsyms.cpp
@@ -115,7 +115,7 @@ private slots:
if (!QFile::exists(path))
QSKIP("/proc/kallsysms not available");
- auto checkSysCtl = [](const QString &knob, int expectedValue) -> bool {
+ auto checkSysCtl = [](const QString &knob, int maxValue) -> bool {
QFile file(QLatin1String("/proc/sys/kernel/") + knob);
if (!file.open(QIODevice::ReadOnly)) {
qWarning() << "failed to open sysctl file for" << knob;
@@ -126,12 +126,12 @@ private slots:
const auto value = contents.toInt(&ok);
if (!ok)
qWarning() << "Failed to parse sysctl file contents for" << knob << contents;
- return ok && value == expectedValue;
+ return ok && value <= maxValue;
};
if (!checkSysCtl(QStringLiteral("kptr_restrict"), 0)) {
- QEXPECT_FAIL("", "sysctl kernel.kptr_restrict != 0, cannot parse /proc/kallsyms", Abort);
- } else if (!checkSysCtl(QStringLiteral("perf_event_paranoid"), -1)) {
- QEXPECT_FAIL("", "sysctl kernel.perf_event_paranoid != -1, cannot parse /proc/kallsyms", Abort);
+ QEXPECT_FAIL("", "sysctl kernel.kptr_restrict > 0, cannot parse /proc/kallsyms", Abort);
+ } else if (!checkSysCtl(QStringLiteral("perf_event_paranoid"), 1)) {
+ QEXPECT_FAIL("", "sysctl kernel.perf_event_paranoid > 1, cannot parse /proc/kallsyms", Abort);
}
PerfKallsyms kallsyms;