From 1b1d7020877ba762ec3ab31b690ba7f949b9bd91 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Fri, 7 Apr 2017 22:49:44 +0200
Subject: debug: cleanups

---
 src/tests/debug.mk      | 2 +-
 src/tests/qemu/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/tests')

diff --git a/src/tests/debug.mk b/src/tests/debug.mk
index 6cd14b6..9e34e53 100644
--- a/src/tests/debug.mk
+++ b/src/tests/debug.mk
@@ -8,7 +8,7 @@ SSH_OPTS := -q -o ControlMaster=auto -o ControlPath=.ssh-deployment.sock
 SSH_OPTS1 := $(SSH_OPTS)-1
 SSH_OPTS2 := $(SSH_OPTS)-2
 SSH_OPTS3 := $(SSH_OPTS)-3
-RSYNC_OPTS := --include="selftest" --include="tools" --include="tests" --include="crypto" --include="*.mk" --include="*.sh" --include="*.8" --include="*.S" --include="*.c" --include="*.h" --include="Makefile" --include="Kbuild" --exclude="*" -avP #--delete --delete-excluded
+RSYNC_OPTS := --exclude="*.o" --exclude="*.mod.c" --exclude="tests/qemu" --exclude "*.ko" --exclude="*.cmd" -avP
 
 MAYBE_DEBUG := "debug"
 ifeq ($(D),0)
diff --git a/src/tests/qemu/Makefile b/src/tests/qemu/Makefile
index c5f3411..a9ce0a6 100644
--- a/src/tests/qemu/Makefile
+++ b/src/tests/qemu/Makefile
@@ -14,7 +14,7 @@ DOWNLOAD := wget -O
 MIRROR := https://download.wireguard.io/qemu-test/distfiles/
 
 CHOST := x86_64-pc-linux-gnu
-WIREGUARD_SOURCES := $(wildcard ../../*.c ../../*.h ../../selftest/*.h ../../crypto/*.c ../../crypto/*.h ../../crypto/*.S)
+WIREGUARD_SOURCES := $(wildcard ../../*.c ../../*.h ../../selftest/*.h ../../crypto/*.c ../../crypto/*.h ../../crypto/*.S ../../compat/*.h)
 TOOLS_SOURCES := $(wildcard ../../tools/*.c ../../tools*.h ../../uapi.h)
 
 default: qemu
@@ -113,7 +113,7 @@ $(KERNEL_PATH)/.installed: $(KERNEL_TAR)
 $(KERNEL_PATH)/.config: kernel.config | $(KERNEL_PATH)/.installed
 	cp kernel.config $(KERNEL_PATH)/minimal.config
 	printf 'CONFIG_NR_CPUS=$(NR_CPUS)\nCONFIG_INITRAMFS_SOURCE="$(BUILD_PATH)/init-cpio-spec.txt"\n' >> $(KERNEL_PATH)/minimal.config
-	$(MAKE) -C $(KERNEL_PATH) ARCH=x86_64 tinyconfig
+	$(MAKE) -C $(KERNEL_PATH) ARCH=x86_64 allnoconfig
 	cd $(KERNEL_PATH) && scripts/kconfig/merge_config.sh -n .config minimal.config
 	-[ "$(DEBUG_KERNEL)" = "yes" ] && ( cd $(KERNEL_PATH) && scripts/kconfig/merge_config.sh -n .config $(PWD)/debug.config )
 
-- 
cgit v1.2.3-59-g8ed1b