From 37b74cd909f60076a096ab8ac2635bc77755153f Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 3 Nov 2010 16:48:56 -0600 Subject: [PATCH] tests: fix compiler warnings Detected by icc. The first three files are real test bugs, the last merely silences a warning about mixing an int with an enum type. * tests/test-getopt.h (test_getopt): Fix condition. * tests/test-getopt_long.h (test_getopt_long): Likewise. * tests/test-pipe2.c (main): Likewise. * tests/test-quotearg-simple.c (main): Avoid icc warning. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ tests/test-getopt.h | 2 +- tests/test-getopt_long.h | 2 +- tests/test-pipe2.c | 4 ++-- tests/test-quotearg-simple.c | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73e19daa9..68c0a7584 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-11-03 Eric Blake + tests: fix compiler warnings + * tests/test-getopt.h (test_getopt): Fix condition. + * tests/test-getopt_long.h (test_getopt_long): Likewise. + * tests/test-pipe2.c (main): Likewise. + * tests/test-quotearg-simple.c (main): Avoid icc warning. + utimens: fix broken m4 test * m4/utimens.m4 (gl_UTIMENS): Include correct headers. diff --git a/tests/test-getopt.h b/tests/test-getopt.h index 8baa39d02..12859ac9e 100644 --- a/tests/test-getopt.h +++ b/tests/test-getopt.h @@ -1187,7 +1187,7 @@ test_getopt (void) ASSERT (q_value == NULL); ASSERT (non_options_count == 0); ASSERT (unrecognized == 0); - ASSERT (optind = 1); + ASSERT (optind == 1); ASSERT (!output); } #endif /* GNULIB_TEST_GETOPT_GNU */ diff --git a/tests/test-getopt_long.h b/tests/test-getopt_long.h index 0e58fecbb..e1bf73233 100644 --- a/tests/test-getopt_long.h +++ b/tests/test-getopt_long.h @@ -1747,7 +1747,7 @@ test_getopt_long (void) ASSERT (q_value == NULL); ASSERT (non_options_count == 0); ASSERT (unrecognized == 0); - ASSERT (optind = 1); + ASSERT (optind == 1); } /* Check that the '+' flag has to come first. */ diff --git a/tests/test-pipe2.c b/tests/test-pipe2.c index e8e579897..a39de584a 100644 --- a/tests/test-pipe2.c +++ b/tests/test-pipe2.c @@ -117,8 +117,8 @@ main () ASSERT (fd[0] >= 0); ASSERT (fd[1] >= 0); ASSERT (fd[0] != fd[1]); - ASSERT (is_open (fd[0]) >= 0); - ASSERT (is_open (fd[1]) >= 0); + ASSERT (is_open (fd[0])); + ASSERT (is_open (fd[1])); if (use_cloexec) { ASSERT (is_cloexec (fd[0])); diff --git a/tests/test-quotearg-simple.c b/tests/test-quotearg-simple.c index 095b199ae..bd637eec7 100644 --- a/tests/test-quotearg-simple.c +++ b/tests/test-quotearg-simple.c @@ -244,7 +244,7 @@ main (int argc _GL_UNUSED, char *argv[]) ASSERT (!isprint ('\033')); for (i = literal_quoting_style; i <= clocale_quoting_style; i++) { - set_quoting_style (NULL, i); + set_quoting_style (NULL, (enum quoting_style) i); compare_strings (use_quotearg_buffer, &results_g[i].group1, ascii_only); compare_strings (use_quotearg, &results_g[i].group2, ascii_only); if (i == c_quoting_style) -- 2.11.0