Skip to content

Commit

Permalink
tools: selftests: fix build issue with make kselftests target
Browse files Browse the repository at this point in the history
Fix the typo of ARCH when running 'make kselftests'.  Change the 'X86'
to 'x86'.  Test by compilation.

Signed-off-by: Phong Tran <[email protected]>
Cc: David Herrmann <[email protected]>
Cc: Hugh Dickins <[email protected]>
Cc: Shuah Khan <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Cc: Michal Marek <[email protected]>
Cc: Shuah Khan <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
phongt authored and torvalds committed Aug 29, 2014
1 parent 8c7b638 commit 498b473
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions tools/testing/selftests/ipc/Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
uname_M := $(shell uname -m 2>/dev/null || echo not)
ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/)
ifeq ($(ARCH),i386)
ARCH := X86
ARCH := x86
CFLAGS := -DCONFIG_X86_32 -D__i386__
endif
ifeq ($(ARCH),x86_64)
ARCH := X86
ARCH := x86
CFLAGS := -DCONFIG_X86_64 -D__x86_64__
endif

CFLAGS += -I../../../../usr/include/

all:
ifeq ($(ARCH),X86)
ifeq ($(ARCH),x86)
gcc $(CFLAGS) msgque.c -o msgque_test
else
echo "Not an x86 target, can't build msgque selftest"
Expand Down
6 changes: 3 additions & 3 deletions tools/testing/selftests/kcmp/Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
uname_M := $(shell uname -m 2>/dev/null || echo not)
ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/)
ifeq ($(ARCH),i386)
ARCH := X86
ARCH := x86
CFLAGS := -DCONFIG_X86_32 -D__i386__
endif
ifeq ($(ARCH),x86_64)
ARCH := X86
ARCH := x86
CFLAGS := -DCONFIG_X86_64 -D__x86_64__
endif

Expand All @@ -15,7 +15,7 @@ CFLAGS += -I../../../../usr/include/
CFLAGS += -I../../../../arch/x86/include/

all:
ifeq ($(ARCH),X86)
ifeq ($(ARCH),x86)
gcc $(CFLAGS) kcmp_test.c -o kcmp_test
else
echo "Not an x86 target, can't build kcmp selftest"
Expand Down
10 changes: 5 additions & 5 deletions tools/testing/selftests/memfd/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
uname_M := $(shell uname -m 2>/dev/null || echo not)
ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/)
ifeq ($(ARCH),i386)
ARCH := X86
ARCH := x86
endif
ifeq ($(ARCH),x86_64)
ARCH := X86
ARCH := x86
endif

CFLAGS += -D_FILE_OFFSET_BITS=64
Expand All @@ -14,20 +14,20 @@ CFLAGS += -I../../../../include/uapi/
CFLAGS += -I../../../../include/

all:
ifeq ($(ARCH),X86)
ifeq ($(ARCH),x86)
gcc $(CFLAGS) memfd_test.c -o memfd_test
else
echo "Not an x86 target, can't build memfd selftest"
endif

run_tests: all
ifeq ($(ARCH),X86)
ifeq ($(ARCH),x86)
gcc $(CFLAGS) memfd_test.c -o memfd_test
endif
@./memfd_test || echo "memfd_test: [FAIL]"

build_fuse:
ifeq ($(ARCH),X86)
ifeq ($(ARCH),x86)
gcc $(CFLAGS) fuse_mnt.c `pkg-config fuse --cflags --libs` -o fuse_mnt
gcc $(CFLAGS) fuse_test.c -o fuse_test
else
Expand Down

0 comments on commit 498b473

Please sign in to comment.