summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-07-16 12:01:01 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-07-16 12:04:31 -0400
commitdaabe5491ee0c78b735336c9e69b7f6ea57464e0 (patch)
treeb2b02be86dfa1928d9d91bd8eed747e0194abc23 /src
parent21c72713ae89cfc2c4096c383af9bb482665e0a6 (diff)
test-tables: allow sparse tables and check mapping for -1
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.
Diffstat (limited to 'src')
-rw-r--r--src/shared/test-tables.h11
-rw-r--r--src/test/test-tables.c2
2 files changed, 8 insertions, 5 deletions
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)
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index 9a3d3e8e74..3b7800cf37 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -99,7 +99,7 @@ int main(int argc, char **argv) {
test_table(unit_load_state, UNIT_LOAD_STATE);
test_table(unit_type, UNIT_TYPE);
- _test_table("syscall", syscall_to_name, syscall_from_name, syscall_max());
+ _test_table("syscall", syscall_to_name, syscall_from_name, syscall_max(), true);
return EXIT_SUCCESS;
}