From 863559071356459e9374a91e51c14e27c0a9b156 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Sat, 29 Sep 2018 13:12:05 +0200 Subject: Prep v239: Mask unneeded test in test-strip-ansi The final test use the outcome of the already masked part that utilizes terminal_urlify_path(). That function is masked, because it is nowhere used within elogind. The previously unmasked final test used the outcome of that already masked part and therefore crashed. Bug: https://github.com/elogind/elogind/issues/81 Closes: https://github.com/elogind/elogind/issues/81 Signed-of-by: Sven Eden --- man/rules/meson.build | 3 ++- src/test/test-strip-tab-ansi.c | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/man/rules/meson.build b/man/rules/meson.build index 3a47be9da..74191d00b 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -1,6 +1,7 @@ # Do not edit. Generated by make-man-rules.py. manpages = [ -['elogind', '8', [], ''], +['elogind-inhibit', '1', [], ''], + ['elogind', '8', [], ''], ['elogind.syntax', '7', [], ''], ['loginctl', '1', [], ''], ['logind.conf', '5', [], ''], diff --git a/src/test/test-strip-tab-ansi.c b/src/test/test-strip-tab-ansi.c index 8ee10fd0c..27e2a240e 100644 --- a/src/test/test-strip-tab-ansi.c +++ b/src/test/test-strip-tab-ansi.c @@ -8,12 +8,13 @@ #include "util.h" int main(int argc, char *argv[]) { -#if 0 /// urlified is UNNEEDED by elogind +#if 0 /// urlified and z are UNNEEDED by elogind _cleanup_free_ char *urlified = NULL, *q = NULL, *qq = NULL; + char *p, *z; #else _cleanup_free_ char *q = NULL, *qq = NULL; + char *p; #endif // 0 - char *p, *z; assert_se(p = strdup("\tFoobar\tbar\twaldo\t")); assert_se(strip_tab_ansi(&p, NULL, NULL)); @@ -46,7 +47,6 @@ int main(int argc, char *argv[]) { printf("<%s>\n", p); assert_se(streq(p, "something i am a fabulous link something-else")); p = mfree(p); -#endif // 0 /* Truncate the formatted string in the middle of an ANSI sequence (in which case we shouldn't touch the * incomplete sequence) */ @@ -57,6 +57,7 @@ int main(int argc, char *argv[]) { assert_se(strip_tab_ansi(&q, NULL, NULL)); assert_se(streq(q, qq)); } +#endif // 0 return 0; } -- cgit v1.2.3