diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-27 17:37:04 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-27 17:37:04 +0000 |
| commit | 99d6349978b2117ed7ca3e0e3d2d84616df323d6 (patch) | |
| tree | c75879012cba1026d3cee3ae7a793d0c525d6cc8 /tests/basic | |
| parent | 0c5be869ffb7de6ca1107a5804d6d4d536d80e91 (diff) | |
| parent | 1b7b72c0e96856d2b9f73f705787af3426662bcf (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tests/basic')
| -rw-r--r-- | tests/basic/config.h | 5 | ||||
| -rw-r--r-- | tests/basic/rules.mk | 2 | ||||
| -rw-r--r-- | tests/basic/test_macro.cpp | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/tests/basic/config.h b/tests/basic/config.h index e5d018a32a..99bd62d991 100644 --- a/tests/basic/config.h +++ b/tests/basic/config.h @@ -14,10 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef TESTS_BASIC_CONFIG_H_ -#define TESTS_BASIC_CONFIG_H_ +#pragma once #define MATRIX_ROWS 4 #define MATRIX_COLS 10 - -#endif /* TESTS_BASIC_CONFIG_H_ */ diff --git a/tests/basic/rules.mk b/tests/basic/rules.mk index 8a906807cf..9fb5d43610 100644 --- a/tests/basic/rules.mk +++ b/tests/basic/rules.mk @@ -13,4 +13,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -CUSTOM_MATRIX=yes
\ No newline at end of file +CUSTOM_MATRIX=yes diff --git a/tests/basic/test_macro.cpp b/tests/basic/test_macro.cpp index a1fa317089..dc4a77796a 100644 --- a/tests/basic/test_macro.cpp +++ b/tests/basic/test_macro.cpp @@ -68,4 +68,4 @@ TEST_F(Macro, PlayASimpleMacro) { EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).AT_TIME(210); EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(220); run_one_scan_loop(); -}
\ No newline at end of file +} |