From daabe5491ee0c78b735336c9e69b7f6ea57464e0 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Tue, 16 Jul 2013 12:01:01 -0400 Subject: test-tables: allow sparse tables and check mapping for -1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Jan: test-tables fails on my system. The one it's failing on is: syscall: 222 → (null) → -1 ... and indeed, our own tables should not have holes, but syscall tables certainly might. --- src/shared/test-tables.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/shared') diff --git a/src/shared/test-tables.h b/src/shared/test-tables.h index deebec2ed2..3261302077 100644 --- a/src/shared/test-tables.h +++ b/src/shared/test-tables.h @@ -26,10 +26,11 @@ typedef int (*reverse_t)(const char*); static inline void _test_table(const char *name, lookup_t lookup, reverse_t reverse, - int size) { + int size, + bool sparse) { int i; - for (i = 0; i < size + 1; i++) { + for (i = -1; i < size + 1; i++) { const char* val = lookup(i); int rev; @@ -39,10 +40,12 @@ static inline void _test_table(const char *name, rev = reverse("--no-such--value----"); printf("%s: %d → %s → %d\n", name, i, val, rev); - if (i < size ? val == NULL || rev != i : val != NULL || rev != -1) + if (i >= 0 && i < size ? + sparse ? rev != i && rev != -1 : val == NULL || rev != i : + val != NULL || rev != -1) exit(EXIT_FAILURE); } } #define test_table(lower, upper) \ - _test_table(STRINGIFY(lower), lower##_to_string, lower##_from_string, _##upper##_MAX) + _test_table(STRINGIFY(lower), lower##_to_string, lower##_from_string, _##upper##_MAX, false) -- cgit v1.2.3-54-g00ecf