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

Commit 30ec5682 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-4.3-rc2' of... 

Merge tag 'linux-kselftest-4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:
 "This update contains 7 fixes for problems ranging from build failurs
  to incorrect error reporting"

* tag 'linux-kselftest-4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: exec: revert to default emit rule
  selftests: change install command to rsync
  selftests: mqueue: simplify the Makefile
  selftests: mqueue: allow extra cflags
  selftests: rename jump label to static_keys
  selftests/seccomp: add support for s390
  seltests/zram: fix syntax error
parents 009884f3 ae785818

tools/testing/selftests/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,12 +16,12 @@ TARGETS += powerpc 
TARGETS += ptrace

TARGETS += ptrace

TARGETS += seccomp

TARGETS += seccomp

TARGETS += size

TARGETS += size

TARGETS += static_keys

TARGETS += sysctl

TARGETS += sysctl

ifneq (1, $(quicktest))

ifneq (1, $(quicktest))

TARGETS += timers

TARGETS += timers

endif

endif

TARGETS += user

TARGETS += user

TARGETS += jumplabel

TARGETS += vm

TARGETS += vm

TARGETS += x86

TARGETS += x86

TARGETS += zram

TARGETS += zram

tools/testing/selftests/exec/Makefile

+1 −3
Original line number Original line Diff line number Diff line 
CFLAGS = -Wall

CFLAGS = -Wall

BINARIES = execveat

BINARIES = execveat

DEPS = execveat.symlink execveat.denatured script

DEPS = execveat.symlink execveat.denatured script subdir

all: $(BINARIES) $(DEPS)

all: $(BINARIES) $(DEPS)





subdir:

subdir:
@@ -22,7 +22,5 @@ TEST_FILES := $(DEPS) 




include ../lib.mk

include ../lib.mk





override EMIT_TESTS := echo "mkdir -p subdir; (./execveat && echo \"selftests: execveat [PASS]\") || echo \"selftests: execveat [FAIL]\""



clean:

clean:

	rm -rf $(BINARIES) $(DEPS) subdir.moved execveat.moved xxxxx*
 
	rm -rf $(BINARIES) $(DEPS) subdir.moved execveat.moved xxxxx*

tools/testing/selftests/ftrace/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
all:

all:





TEST_PROGS := ftracetest

TEST_PROGS := ftracetest

TEST_DIRS := test.d/

TEST_DIRS := test.d





include ../lib.mk

include ../lib.mk

tools/testing/selftests/lib.mk

+4 −7
Original line number Original line Diff line number Diff line
@@ -13,12 +13,9 @@ run_tests: all 




define INSTALL_RULE

define INSTALL_RULE

	@if [ "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)" != "X" ]; then					\

	@if [ "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)" != "X" ]; then					\

		mkdir -p $(INSTALL_PATH);								\

		mkdir -p ${INSTALL_PATH};										\

		for TEST_DIR in $(TEST_DIRS); do							\

		echo "rsync -a $(TEST_DIRS) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(INSTALL_PATH)/";	\

			cp -r $$TEST_DIR $(INSTALL_PATH);						\

		rsync -a $(TEST_DIRS) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(INSTALL_PATH)/;		\

		done;											\

		echo "install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES)";	\

		install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES);		\

	fi

	fi

endef

endef

tools/testing/selftests/mqueue/Makefile

+4 −6
Original line number Original line Diff line number Diff line 
CFLAGS = -O2

CFLAGS += -O2

LDLIBS = -lrt -lpthread -lpopt

TEST_PROGS := mq_open_tests mq_perf_tests





all:

all: $(TEST_PROGS)

	$(CC) $(CFLAGS) mq_open_tests.c -o mq_open_tests -lrt

	$(CC) $(CFLAGS) -o mq_perf_tests mq_perf_tests.c -lrt -lpthread -lpopt





include ../lib.mk

include ../lib.mk
@@ -11,8 +11,6 @@ override define RUN_TESTS 
	@./mq_perf_tests || echo "selftests: mq_perf_tests [FAIL]"

	@./mq_perf_tests || echo "selftests: mq_perf_tests [FAIL]"

endef

endef





TEST_PROGS := mq_open_tests mq_perf_tests



override define EMIT_TESTS

override define EMIT_TESTS

	echo "./mq_open_tests /test1 || echo \"selftests: mq_open_tests [FAIL]\""

	echo "./mq_open_tests /test1 || echo \"selftests: mq_open_tests [FAIL]\""

	echo "./mq_perf_tests || echo \"selftests: mq_perf_tests [FAIL]\""

	echo "./mq_perf_tests || echo \"selftests: mq_perf_tests [FAIL]\""