Skip to content

Commit 74f1456

Browse files
committed
Merge tag 'linux-kselftest-fixes-6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull Kselftest fixes from Shuah Khan: "Fixes to bugs that are interfering with arm64 and risc workflows. Also two fixes to timer and mincore tests that are causing test failures" * tag 'linux-kselftest-fixes-6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests/arm64: fix build failure during the "emit_tests" step selftests/riscv: fix potential build failure during the "emit_tests" step tools: timers: fix freq average calculation selftests/mincore: fix skip condition for check_huge_pages test
2 parents f2f393c + 569f8b5 commit 74f1456

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

tools/testing/selftests/arm64/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ run_tests: all
4242
done
4343

4444
# Avoid any output on non arm64 on emit_tests
45-
emit_tests: all
45+
emit_tests:
4646
@for DIR in $(ARM64_SUBTARGETS); do \
4747
BUILD_TARGET=$(OUTPUT)/$$DIR; \
4848
make OUTPUT=$$BUILD_TARGET -C $$DIR $@; \

tools/testing/selftests/mincore/mincore_selftest.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ TEST(check_huge_pages)
150150
MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB,
151151
-1, 0);
152152
if (addr == MAP_FAILED) {
153-
if (errno == ENOMEM)
154-
SKIP(return, "No huge pages available.");
153+
if (errno == ENOMEM || errno == EINVAL)
154+
SKIP(return, "No huge pages available or CONFIG_HUGETLB_PAGE disabled.");
155155
else
156156
TH_LOG("mmap error: %s", strerror(errno));
157157
}

tools/testing/selftests/riscv/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ run_tests: all
4343
done
4444

4545
# Avoid any output on non riscv on emit_tests
46-
emit_tests: all
46+
emit_tests:
4747
@for DIR in $(RISCV_SUBTARGETS); do \
4848
BUILD_TARGET=$(OUTPUT)/$$DIR; \
4949
$(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@; \

tools/testing/selftests/timers/raw_skew.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ int main(int argc, char **argv)
129129
printf("%lld.%i(est)", eppm/1000, abs((int)(eppm%1000)));
130130

131131
/* Avg the two actual freq samples adjtimex gave us */
132-
ppm = (tx1.freq + tx2.freq) * 1000 / 2;
133-
ppm = (long long)tx1.freq * 1000;
132+
ppm = (long long)(tx1.freq + tx2.freq) * 1000 / 2;
134133
ppm = shift_right(ppm, 16);
135134
printf(" %lld.%i(act)", ppm/1000, abs((int)(ppm%1000)));
136135

0 commit comments

Comments
 (0)