From 95732541b18c5b9858b72c86bfe582a09a49e6ba Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 30 Jan 2022 18:50:28 +0100 Subject: [PATCH] tests: Fix interpretation of setupterm's return code. * tests/test-terminfo.c (main): Test the value of err when setupterm fails, not when it succeeds. * tests/test-termcap.c (main): Likewise. --- ChangeLog | 7 +++++++ tests/test-termcap.c | 2 +- tests/test-terminfo.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c9a1e7989..fedc7dc777 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2022-01-30 Bruno Haible + + tests: Fix interpretation of setupterm's return code. + * tests/test-terminfo.c (main): Test the value of err when setupterm + fails, not when it succeeds. + * tests/test-termcap.c (main): Likewise. + 2022-01-30 Bruno Haible terminfo: Add tests. diff --git a/tests/test-termcap.c b/tests/test-termcap.c index 2350012ec8..869f30e988 100644 --- a/tests/test-termcap.c +++ b/tests/test-termcap.c @@ -50,7 +50,7 @@ main (int argc, char *argv[]) } #elif HAVE_TERMINFO int err = 1; - if (setupterm (term, STDOUT_FILENO, &err) || err == 1) + if (setupterm (term, STDOUT_FILENO, &err) == 0 || err == 1) { underline_on = tigetstr ("smul"); underline_off = tigetstr ("rmul"); diff --git a/tests/test-terminfo.c b/tests/test-terminfo.c index 85c3e0bcfb..9f8f5e88a1 100644 --- a/tests/test-terminfo.c +++ b/tests/test-terminfo.c @@ -40,7 +40,7 @@ main (int argc, char *argv[]) { #if HAVE_TERMINFO int err = 1; - if (setupterm (term, STDOUT_FILENO, &err) || err == 1) + if (setupterm (term, STDOUT_FILENO, &err) == 0 || err == 1) { underline_on = tigetstr ("smul"); underline_off = tigetstr ("rmul"); -- 2.39.5