Skip to content

Commit 9c1bec9

Browse files
committed
Merge tag 'linux-kselftest-fixes-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest fixes from Shuah Khan: "A fix to amd-pstate test Makefile and a fix to LLVM build for x86 in kselftest common lib.mk" * tag 'linux-kselftest-fixes-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests: fix LLVM build for i386 and x86_64 selftests: amd-pstate: fix TEST_FILES
2 parents 6015b1a + 624c60f commit 9c1bec9

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

tools/testing/selftests/amd-pstate/Makefile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@
44
# No binaries, but make sure arg-less "make" doesn't trigger "run_tests"
55
all:
66

7-
uname_M := $(shell uname -m 2>/dev/null || echo not)
8-
ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
7+
ARCH ?= $(shell uname -m 2>/dev/null || echo not)
8+
ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
99

10-
TEST_PROGS := run.sh
11-
TEST_FILES := basic.sh tbench.sh gitsource.sh
10+
ifeq (x86,$(ARCH))
11+
TEST_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py
12+
TEST_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
13+
endif
14+
15+
TEST_PROGS += run.sh
16+
TEST_FILES += basic.sh tbench.sh gitsource.sh
1217

1318
include ../lib.mk

tools/testing/selftests/lib.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ endif
1010
CLANG_TARGET_FLAGS_arm := arm-linux-gnueabi
1111
CLANG_TARGET_FLAGS_arm64 := aarch64-linux-gnu
1212
CLANG_TARGET_FLAGS_hexagon := hexagon-linux-musl
13+
CLANG_TARGET_FLAGS_i386 := i386-linux-gnu
1314
CLANG_TARGET_FLAGS_m68k := m68k-linux-gnu
1415
CLANG_TARGET_FLAGS_mips := mipsel-linux-gnu
1516
CLANG_TARGET_FLAGS_powerpc := powerpc64le-linux-gnu
1617
CLANG_TARGET_FLAGS_riscv := riscv64-linux-gnu
1718
CLANG_TARGET_FLAGS_s390 := s390x-linux-gnu
1819
CLANG_TARGET_FLAGS_x86 := x86_64-linux-gnu
20+
CLANG_TARGET_FLAGS_x86_64 := x86_64-linux-gnu
1921
CLANG_TARGET_FLAGS := $(CLANG_TARGET_FLAGS_$(ARCH))
2022

2123
ifeq ($(CROSS_COMPILE),)

0 commit comments

Comments
 (0)