diff options
| author | Craig Barnes <craigbarnes@protonmail.com> | 2021-05-25 17:38:16 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-05-26 07:13:58 +0000 |
| commit | 3d9302b6f95e3bb0f00695faf8c575440c685840 (patch) | |
| tree | 19dc7a6cd1919b14234c5d1db7f66113a4786959 | |
| parent | input: regression test for escape sequence generated for ctrl+shift+tab (diff) | |
macros: add UNITTEST macro and use to replace test_keymap_lookup()
| -rw-r--r-- | input.c | 5 | ||||
| -rw-r--r-- | macros.h | 16 |
2 files changed, 17 insertions, 4 deletions
@@ -884,9 +884,7 @@ keymap_lookup(struct terminal *term, xkb_keysym_t sym, enum modifier mods) return NULL; } -#if defined(_DEBUG) -static void __attribute__((constructor)) -test_keymap_lookup(void) +UNITTEST { struct terminal term = { .num_lock_modifier = false, @@ -897,7 +895,6 @@ test_keymap_lookup(void) const struct key_data *info = keymap_lookup(&term, XKB_KEY_ISO_Left_Tab, MOD_SHIFT | MOD_CTRL); xassert(strcmp(info->seq, "\033[27;6;9~") == 0); } -#endif static void key_press_release(struct seat *seat, struct terminal *term, uint32_t serial, @@ -1,5 +1,7 @@ #pragma once +#define PASTE(a, b) a##b +#define XPASTE(a, b) PASTE(a, b) #define DO_PRAGMA(x) _Pragma(#x) #define VERCMP(x, y, cx, cy) ((cx > x) || ((cx == x) && (cy >= y))) @@ -68,6 +70,7 @@ #if GNUC_AT_LEAST(3, 0) || HAS_ATTRIBUTE(constructor) #define CONSTRUCTOR __attribute__((__constructor__)) + #define HAVE_ATTR_CONSTRUCTOR 1 #else #define CONSTRUCTOR #endif @@ -175,6 +178,19 @@ #define UNROLL_LOOP(n) #endif +#ifdef __COUNTER__ + // Supported by GCC 4.3+ and Clang + #define COUNTER_ __COUNTER__ +#else + #define COUNTER_ __LINE__ +#endif + +#if defined(_DEBUG) && defined(HAVE_ATTR_CONSTRUCTOR) + #define UNITTEST static void CONSTRUCTOR XPASTE(unittest_, COUNTER_)(void) +#else + #define UNITTEST static void UNUSED XPASTE(unittest_, COUNTER_)(void) +#endif + #ifdef __clang__ #define IGNORE_WARNING(wflag) \ DO_PRAGMA(clang diagnostic push) \ |
