linux-kselftest-4.1-rc4
Urgent fix for Kselftest regression introduced in 4.1-rc1 by the new x86 test due to its hard dependency on 32-bit build environment. A set of 5 patches fix the make kselftest run and kselftest install. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVVippAAoJEAsCRMQNDUMctWgP/iVLHOTuJLsr7LB4DPZuMdeU RlNUkRaSbEpx8Ua8LLGnGHY3BlrOHTQ3WYN8wUc89DS85mpTJfFqS2RXBkg3na/e J5MYOr2q+tq1D7o6lvHRL0cTvxH4PP1FPtQJiQc8410m45IWtuPK8h8Gb0VLApMm M/Abbf/hlRAllL1sJj7SfEAErVaUTRzyJxfNbTbOMQWgneQNcumEl01R7G83ahFc avhtoJD4vL7JMJE01HI1sy2FGQHeMouXRlFuoQrC5jJm4l04jtX2iERqLprpPtDX /k0+FTtLxci+jNdYEDPQVAZoOQV+XDZR7BvR3r4etADLYWoTc2Ub+Kc98exq7C+q at3pyOWr0Gj+Q6fItZFpTBnsCu3Lc1zBxEL/rM4MZ5NN56JBwqZtQj1++e8SKOIe CnDCBoOw6M0tQzMIELKXjXFD1ah3OHrUAQawHVr5LCGoJsiLTg7r3OOFxWk/OA4R 8Alnt2U2PzAOWYieSQiA5TeoqHUSSM9pV04NpbjufA4bVas8vfsf8QEAqxw9o8iP mOzBhL8VbIMnu2KxF+q+T87Be/dT2px60qRfoSiVTMwmqWnu/R7E2jI0iXwkBjd4 it23jRW1NjnMUONFyxmqMYtoiyu3c3ZvzXvAPJz+aZEHd/jyuGBhOOJqU8M4L6yS 0N3BWyJ/6enYHMa4FdZk =09md -----END PGP SIGNATURE----- Merge tag 'linux-kselftest-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest Pull kselftest fixes from Shuah Khan: "Urgent fix for Kselftest regression introduced in 4.1-rc1 by the new x86 test due to its hard dependency on 32-bit build environment. A set of 5 patches fix the make kselftest run and kselftest install" * tag 'linux-kselftest-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests, x86: Rework x86 target architecture detection selftests, x86: Remove useless run_tests rule selftests/x86: install tests selftest/x86: have no dependency on all when cross building selftest/x86: build both bitnesses
This commit is contained in:
Linus Torvalds
commit
d70933beec
|
|
@ -1,4 +1,8 @@
|
|||
.PHONY: all all_32 all_64 check_build32 clean run_tests
|
||||
all:
|
||||
|
||||
include ../lib.mk
|
||||
|
||||
.PHONY: all all_32 all_64 warn_32bit_failure clean
|
||||
|
||||
TARGETS_C_BOTHBITS := sigreturn single_step_syscall
|
||||
|
||||
|
|
@ -7,42 +11,47 @@ BINARIES_64 := $(TARGETS_C_BOTHBITS:%=%_64)
|
|||
|
||||
CFLAGS := -O2 -g -std=gnu99 -pthread -Wall
|
||||
|
||||
UNAME_P := $(shell uname -p)
|
||||
UNAME_M := $(shell uname -m)
|
||||
CAN_BUILD_I386 := $(shell ./check_cc.sh $(CC) trivial_32bit_program.c -m32)
|
||||
CAN_BUILD_X86_64 := $(shell ./check_cc.sh $(CC) trivial_64bit_program.c)
|
||||
|
||||
# Always build 32-bit tests
|
||||
ifeq ($(CAN_BUILD_I386),1)
|
||||
all: all_32
|
||||
|
||||
# If we're on a 64-bit host, build 64-bit tests as well
|
||||
ifeq ($(shell uname -p),x86_64)
|
||||
all: all_64
|
||||
TEST_PROGS += $(BINARIES_32)
|
||||
endif
|
||||
|
||||
all_32: check_build32 $(BINARIES_32)
|
||||
ifeq ($(CAN_BUILD_X86_64),1)
|
||||
all: all_64
|
||||
TEST_PROGS += $(BINARIES_64)
|
||||
endif
|
||||
|
||||
all_32: $(BINARIES_32)
|
||||
|
||||
all_64: $(BINARIES_64)
|
||||
|
||||
clean:
|
||||
$(RM) $(BINARIES_32) $(BINARIES_64)
|
||||
|
||||
run_tests:
|
||||
./run_x86_tests.sh
|
||||
|
||||
$(TARGETS_C_BOTHBITS:%=%_32): %_32: %.c
|
||||
$(CC) -m32 -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl
|
||||
|
||||
$(TARGETS_C_BOTHBITS:%=%_64): %_64: %.c
|
||||
$(CC) -m64 -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl
|
||||
|
||||
check_build32:
|
||||
@if ! $(CC) -m32 -o /dev/null trivial_32bit_program.c; then \
|
||||
echo "Warning: you seem to have a broken 32-bit build" 2>&1; \
|
||||
echo "environment. If you are using a Debian-like"; \
|
||||
echo " distribution, try:"; \
|
||||
echo ""; \
|
||||
echo " apt-get install gcc-multilib libc6-i386 libc6-dev-i386"; \
|
||||
echo ""; \
|
||||
echo "If you are using a Fedora-like distribution, try:"; \
|
||||
echo ""; \
|
||||
echo " yum install glibc-devel.*i686"; \
|
||||
exit 1; \
|
||||
fi
|
||||
# x86_64 users should be encouraged to install 32-bit libraries
|
||||
ifeq ($(CAN_BUILD_I386)$(CAN_BUILD_X86_64),01)
|
||||
all: warn_32bit_failure
|
||||
|
||||
warn_32bit_failure:
|
||||
@echo "Warning: you seem to have a broken 32-bit build" 2>&1; \
|
||||
echo "environment. This will reduce test coverage of 64-bit" 2>&1; \
|
||||
echo "kernels. If you are using a Debian-like distribution," 2>&1; \
|
||||
echo "try:"; 2>&1; \
|
||||
echo ""; \
|
||||
echo " apt-get install gcc-multilib libc6-i386 libc6-dev-i386"; \
|
||||
echo ""; \
|
||||
echo "If you are using a Fedora-like distribution, try:"; \
|
||||
echo ""; \
|
||||
echo " yum install glibc-devel.*i686"; \
|
||||
exit 0;
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
#!/bin/sh
|
||||
# check_cc.sh - Helper to test userspace compilation support
|
||||
# Copyright (c) 2015 Andrew Lutomirski
|
||||
# GPL v2
|
||||
|
||||
CC="$1"
|
||||
TESTPROG="$2"
|
||||
shift 2
|
||||
|
||||
if "$CC" -o /dev/null "$TESTPROG" -O0 "$@" 2>/dev/null; then
|
||||
echo 1
|
||||
else
|
||||
echo 0
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# This is deliberately minimal. IMO kselftests should provide a standard
|
||||
# script here.
|
||||
./sigreturn_32 || exit 1
|
||||
./single_step_syscall_32 || exit 1
|
||||
|
||||
if [[ "$uname -p" -eq "x86_64" ]]; then
|
||||
./sigreturn_64 || exit 1
|
||||
./single_step_syscall_64 || exit 1
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
@ -4,6 +4,10 @@
|
|||
* GPL v2
|
||||
*/
|
||||
|
||||
#ifndef __i386__
|
||||
# error wrong architecture
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
int main()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
/*
|
||||
* Trivial program to check that we have a valid 32-bit build environment.
|
||||
* Copyright (c) 2015 Andy Lutomirski
|
||||
* GPL v2
|
||||
*/
|
||||
|
||||
#ifndef __x86_64__
|
||||
# error wrong architecture
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
int main()
|
||||
{
|
||||
printf("\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
Loading…
Reference in New Issue