From d7220da5cb775f4da139aea141bdd1880eab060a Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Sat, 20 May 2023 13:22:46 -0700 Subject: [PATCH] [Bug] Fix issue with Repeat Key-Combo test (#21005) --- tests/repeat_key/repeat_key_combo/test.mk | 1 + tests/repeat_key/repeat_key_combo/test_combos.c | 8 ++++++++ .../repeat_key/repeat_key_combo/test_repeat_key_combo.cpp | 7 ------- 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 tests/repeat_key/repeat_key_combo/test_combos.c diff --git a/tests/repeat_key/repeat_key_combo/test.mk b/tests/repeat_key/repeat_key_combo/test.mk index db6ea7789a..aac41acaeb 100644 --- a/tests/repeat_key/repeat_key_combo/test.mk +++ b/tests/repeat_key/repeat_key_combo/test.mk @@ -16,3 +16,4 @@ REPEAT_KEY_ENABLE = yes COMBO_ENABLE = yes +INTROSPECTION_KEYMAP_C = test_combos.c diff --git a/tests/repeat_key/repeat_key_combo/test_combos.c b/tests/repeat_key/repeat_key_combo/test_combos.c new file mode 100644 index 0000000000..86de89e193 --- /dev/null +++ b/tests/repeat_key/repeat_key_combo/test_combos.c @@ -0,0 +1,8 @@ +// Copyright 2023 Stefan Kerkmann (@KarlK90) +// Copyright 2023 @filterpaper +// Copyright 2023 Nick Brassel (@tzarc) +// SPDX-License-Identifier: GPL-2.0-or-later +#include "quantum.h" + +const uint16_t xy_combo[] PROGMEM = {KC_X, KC_Y, COMBO_END}; +combo_t key_combos[] = {COMBO(xy_combo, KC_Q)}; diff --git a/tests/repeat_key/repeat_key_combo/test_repeat_key_combo.cpp b/tests/repeat_key/repeat_key_combo/test_repeat_key_combo.cpp index 2d2fbaa966..c2d96a0dfe 100644 --- a/tests/repeat_key/repeat_key_combo/test_repeat_key_combo.cpp +++ b/tests/repeat_key/repeat_key_combo/test_repeat_key_combo.cpp @@ -24,13 +24,6 @@ using ::testing::InSequence; namespace { -extern "C" { -// Define a combo: KC_X + KC_Y = KC_Q. -const uint16_t xy_combo[] PROGMEM = {KC_X, KC_Y, COMBO_END}; -combo_t key_combos[] = {COMBO(xy_combo, KC_Q)}; -uint16_t COMBO_LEN = sizeof(key_combos) / sizeof(*key_combos); -} // extern "C" - class RepeatKey : public TestFixture {}; // Tests repeating a combo, KC_X + KC_Y = KC_Q, by typing