diff options
| author | David Ahern <dsahern@gmail.com> | 2019-06-21 15:59:24 -0700 |
|---|---|---|
| committer | David Ahern <dsahern@gmail.com> | 2019-06-21 15:59:24 -0700 |
| commit | f7eef91897f0f1f273e8aeb1dd001f9b4a762094 (patch) | |
| tree | 223f86c906a737ad0cb9b00e677f477277ff4ffa /testsuite | |
| parent | b3cf1167e74ff520917c718b7f8970980be9a219 (diff) | |
| parent | 6d77d9c6ae74fe231d9aab2b7538fdded1d1028c (diff) | |
Merge branch 'master' into next
Conflicts:
include/uapi/linux/snmp.h
Signed-off-by: David Ahern <dsahern@gmail.com>
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/Makefile b/testsuite/Makefile index 94a4a8c6..4451f316 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -18,9 +18,9 @@ KENVFN := $(shell mktemp /tmp/tc_testkenv.XXXXXX) ifneq (,$(wildcard /proc/config.gz)) KCPATH := /proc/config.gz else -KVER := $(shell uname -r) -KCPATHS := /lib/modules/$(KVER)/config /boot/config-$(KVER) -KCPATH := $(firstword $(wildcard $(KCPATHS))) + KVER := $(shell uname -r) + KCPATHS := /lib/modules/$(KVER)/config /boot/config-$(KVER) + KCPATH := $(firstword $(wildcard $(KCPATHS))) endif .PHONY: compile listtests alltests configure $(TESTS) |