Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da93b8c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-4.14-rc5-fixes' of... 

Merge tag 'linux-kselftest-4.14-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:

 - fix for x86: sysret_ss_attrs test build failure preventing the x86
   tests from running

 - fix mqueue: fix regression in silencing test run output

* tag 'linux-kselftest-4.14-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: mqueue: fix regression in silencing output from RUN_TESTS
  selftests: x86: sysret_ss_attrs doesn't build on a PIE build
parents 529a86e0 ea344f6a

tools/testing/selftests/mqueue/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ TEST_GEN_PROGS := mq_open_tests mq_perf_tests 
include ../lib.mk



override define RUN_TESTS

	$(OUTPUT)/mq_open_tests /test1 || echo "selftests: mq_open_tests [FAIL]"

	$(OUTPUT)//mq_perf_tests || echo "selftests: mq_perf_tests [FAIL]"

	@$(OUTPUT)/mq_open_tests /test1 || echo "selftests: mq_open_tests [FAIL]"

	@$(OUTPUT)/mq_perf_tests || echo "selftests: mq_perf_tests [FAIL]"

endef



override define EMIT_TESTS

tools/testing/selftests/x86/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ BINARIES_64 := $(TARGETS_C_64BIT_ALL:%=%_64) 
BINARIES_32 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_32))

BINARIES_64 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_64))



CFLAGS := -O2 -g -std=gnu99 -pthread -Wall

CFLAGS := -O2 -g -std=gnu99 -pthread -Wall -no-pie



UNAME_M := $(shell uname -m)

CAN_BUILD_I386 := $(shell ./check_cc.sh $(CC) trivial_32bit_program.c -m32)