summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-06-26 23:56:01 +0300
committerJack Humbert <jack.humb@gmail.com>2017-07-08 21:59:51 -0400
commit7d7996278571334d04e4a05445ffa4bf341806a2 (patch)
tree67124ebffbae89ef8ec672f105aae98ef62c7911
parent448b91689fc774aded9e646b66256a5c35c3ccf7 (diff)
Move test keymap to keymap.c
-rw-r--r--build_full_test.mk1
-rw-r--r--tests/basic/keymap.c24
-rw-r--r--tests/basic/test.cpp7
3 files changed, 25 insertions, 7 deletions
diff --git a/build_full_test.mk b/build_full_test.mk
index bfd89174de..66ec48a2d3 100644
--- a/build_full_test.mk
+++ b/build_full_test.mk
@@ -19,6 +19,7 @@ TEST_PATH=tests/$(TEST)
$(TEST)_SRC= \
$(TEST_PATH)/test.cpp \
+ $(TEST_PATH)/keymap.c \
$(TMK_COMMON_SRC) \
$(QUANTUM_SRC) \
tests/test_common/matrix.c \
diff --git a/tests/basic/keymap.c b/tests/basic/keymap.c
new file mode 100644
index 0000000000..2afb4d6a96
--- /dev/null
+++ b/tests/basic/keymap.c
@@ -0,0 +1,24 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = {
+ {KC_A, KC_B},
+ {KC_C, KC_D}
+ },
+};
diff --git a/tests/basic/test.cpp b/tests/basic/test.cpp
index 1bd5c2762d..f574481f24 100644
--- a/tests/basic/test.cpp
+++ b/tests/basic/test.cpp
@@ -26,13 +26,6 @@
using testing::_;
using testing::Return;
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = {
- {KC_A, KC_B},
- {KC_C, KC_D}
- },
-};
-
class KeyPress : public TestFixture {};
TEST_F(KeyPress, SendKeyboardIsNotCalledWhenNoKeyIsPressed) {