From 30f22d450da19c65584e6deb8515a1fa5b074e07 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 16 Jun 2017 20:21:28 +0300 Subject: Add basic infrastrucure for building full tests --- build_full_test.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 build_full_test.mk (limited to 'build_full_test.mk') diff --git a/build_full_test.mk b/build_full_test.mk new file mode 100644 index 000000000..0405b9d0f --- /dev/null +++ b/build_full_test.mk @@ -0,0 +1,14 @@ +# Copyright 2017 Fred Sundvik +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . \ No newline at end of file -- cgit v1.2.3-24-g4f1b From 7424261dae180d1cc0e4e46b4ee2d51ef5524e0a Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 16 Jun 2017 21:34:01 +0300 Subject: Try to build tmk_common --- build_full_test.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'build_full_test.mk') diff --git a/build_full_test.mk b/build_full_test.mk index 0405b9d0f..5b4685a91 100644 --- a/build_full_test.mk +++ b/build_full_test.mk @@ -11,4 +11,12 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . \ No newline at end of file +# along with this program. If not, see . + +include tests/$(TEST)/rules.mk +#include $(TMK_PATH)/protocol.mk + +TEST_PATH=tests/$(TEST) + +$(TEST)_SRC=$(TEST_PATH)/test.c $(TMK_COMMON_SRC) +$(TEST)_DEFS=$(TMK_COMMON_DEFS) -- cgit v1.2.3-24-g4f1b From 8674f9c466906c18349490f954c84e501fe3ccb6 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 16 Jun 2017 21:38:34 +0300 Subject: Make sure config.h is included --- build_full_test.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'build_full_test.mk') diff --git a/build_full_test.mk b/build_full_test.mk index 5b4685a91..8b04cc3a4 100644 --- a/build_full_test.mk +++ b/build_full_test.mk @@ -20,3 +20,4 @@ TEST_PATH=tests/$(TEST) $(TEST)_SRC=$(TEST_PATH)/test.c $(TMK_COMMON_SRC) $(TEST)_DEFS=$(TMK_COMMON_DEFS) +$(TEST)_CONFIG=$(TEST_PATH)/config.h -- cgit v1.2.3-24-g4f1b From 1c0fe956ac242b1c85a9b024b9b3966020b862ed Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 16 Jun 2017 22:14:47 +0300 Subject: Split common.mk into common.mk and common_features.mk To support including keyboard/keymap specific rules before it --- build_full_test.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_full_test.mk') diff --git a/build_full_test.mk b/build_full_test.mk index 8b04cc3a4..a4fc8d820 100644 --- a/build_full_test.mk +++ b/build_full_test.mk @@ -18,6 +18,6 @@ include tests/$(TEST)/rules.mk TEST_PATH=tests/$(TEST) -$(TEST)_SRC=$(TEST_PATH)/test.c $(TMK_COMMON_SRC) +$(TEST)_SRC=$(TEST_PATH)/test.c $(TMK_COMMON_SRC) $(QUANTUM_SRC) $(TEST)_DEFS=$(TMK_COMMON_DEFS) $(TEST)_CONFIG=$(TEST_PATH)/config.h -- cgit v1.2.3-24-g4f1b From a72e8f0865e54777a152652c5d46280ceb58efbc Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 16 Jun 2017 22:30:07 +0300 Subject: Dummy test matrix implementation --- build_full_test.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build_full_test.mk') diff --git a/build_full_test.mk b/build_full_test.mk index a4fc8d820..43e2a20a7 100644 --- a/build_full_test.mk +++ b/build_full_test.mk @@ -13,11 +13,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -include tests/$(TEST)/rules.mk #include $(TMK_PATH)/protocol.mk TEST_PATH=tests/$(TEST) -$(TEST)_SRC=$(TEST_PATH)/test.c $(TMK_COMMON_SRC) $(QUANTUM_SRC) +$(TEST)_SRC=$(TEST_PATH)/test.c $(TMK_COMMON_SRC) $(QUANTUM_SRC) tests/test_common/matrix.c $(TEST)_DEFS=$(TMK_COMMON_DEFS) $(TEST)_CONFIG=$(TEST_PATH)/config.h +VPATH+=$(TOP_DIR)/tests/test_common -- cgit v1.2.3-24-g4f1b From 3bb0586acc6472380365d78ee81a332aca468239 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Fri, 16 Jun 2017 23:50:44 +0300 Subject: Add a couple of basic tests and implement driver mock --- build_full_test.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'build_full_test.mk') diff --git a/build_full_test.mk b/build_full_test.mk index 43e2a20a7..5f9bbe5e6 100644 --- a/build_full_test.mk +++ b/build_full_test.mk @@ -17,7 +17,12 @@ TEST_PATH=tests/$(TEST) -$(TEST)_SRC=$(TEST_PATH)/test.c $(TMK_COMMON_SRC) $(QUANTUM_SRC) tests/test_common/matrix.c +$(TEST)_SRC= \ + $(TEST_PATH)/test.cpp \ + $(TMK_COMMON_SRC) \ + $(QUANTUM_SRC) \ + tests/test_common/matrix.c \ + tests/test_common/test_driver.cpp $(TEST)_DEFS=$(TMK_COMMON_DEFS) $(TEST)_CONFIG=$(TEST_PATH)/config.h VPATH+=$(TOP_DIR)/tests/test_common -- cgit v1.2.3-24-g4f1b From bd1729d5be376fecae67ab5ddc92eab82416a5c1 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sat, 17 Jun 2017 18:18:15 +0300 Subject: Actually test for correct key presses --- build_full_test.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build_full_test.mk') diff --git a/build_full_test.mk b/build_full_test.mk index 5f9bbe5e6..67c1ca5e5 100644 --- a/build_full_test.mk +++ b/build_full_test.mk @@ -22,7 +22,8 @@ $(TEST)_SRC= \ $(TMK_COMMON_SRC) \ $(QUANTUM_SRC) \ tests/test_common/matrix.c \ - tests/test_common/test_driver.cpp + tests/test_common/test_driver.cpp \ + tests/test_common/keyboard_report_util.cpp $(TEST)_DEFS=$(TMK_COMMON_DEFS) $(TEST)_CONFIG=$(TEST_PATH)/config.h VPATH+=$(TOP_DIR)/tests/test_common -- cgit v1.2.3-24-g4f1b From 36f820be7e80bc8f1f5489373708356cf142c269 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 18 Jun 2017 23:49:38 +0300 Subject: Add a test fixture It only initializes QMK once, and clears the matrix after each test. --- build_full_test.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build_full_test.mk') diff --git a/build_full_test.mk b/build_full_test.mk index 67c1ca5e5..bfd89174d 100644 --- a/build_full_test.mk +++ b/build_full_test.mk @@ -23,7 +23,8 @@ $(TEST)_SRC= \ $(QUANTUM_SRC) \ tests/test_common/matrix.c \ tests/test_common/test_driver.cpp \ - tests/test_common/keyboard_report_util.cpp + tests/test_common/keyboard_report_util.cpp \ + tests/test_common/test_fixture.cpp $(TEST)_DEFS=$(TMK_COMMON_DEFS) $(TEST)_CONFIG=$(TEST_PATH)/config.h VPATH+=$(TOP_DIR)/tests/test_common -- cgit v1.2.3-24-g4f1b