commit 025e534d8556ce943af1b6a948699b0380bfdf55
parent 4cf54acb419b8e8424b68021ed14bb98259772dc
Author: Christian Grothoff <christian@grothoff.org>
Date: Thu, 25 Dec 2025 14:20:10 +0100
-fix test issues with certain compiler flag options
Diffstat:
6 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/src/tests/raw/test_incompatible.c b/src/tests/raw/test_incompatible.c
@@ -903,7 +903,7 @@ run (MHD_RequestCallback cb,
int
-main ()
+main (void)
{
if (0 !=
run (&server_req_cb,
diff --git a/src/tests/raw/test_ram.c b/src/tests/raw/test_ram.c
@@ -214,6 +214,7 @@ server_req_cb (void *cls,
enum MHD_HTTP_Method method,
uint_fast64_t upload_size)
{
+ (void) cls;
(void) path;
(void) method;
(void) upload_size;
@@ -237,7 +238,7 @@ write_all (int fd,
const void *buf,
size_t buf_size)
{
- const char *cbuf = buf;
+ const char *cbuf = (const char *) buf;
size_t off;
off = 0;
@@ -257,7 +258,7 @@ write_all (int fd,
strerror (errno));
exit (1);
}
- off += ret;
+ off += (size_t) ret;
}
}
@@ -331,7 +332,7 @@ run_test (unsigned int url_len,
(int) body_len,
filler);
if ( (-1 == iret) ||
- (iret > sizeof (upload)) )
+ ( ((size_t) iret) > sizeof (upload)) )
{
fprintf (stderr,
"failed to build request buffer: %d\n",
@@ -645,12 +646,17 @@ no_log (void *cls,
const char *fm,
va_list ap)
{
+ (void) cls;
+ (void) sc;
+ (void) fm;
+ (void) ap;
+
/* intentionally empty */
}
int
-main ()
+main (void)
{
struct MHD_Daemon *d;
diff --git a/src/tests/raw/test_raw.c b/src/tests/raw/test_raw.c
@@ -1016,7 +1016,7 @@ run_tests (void)
int
-main ()
+main (void)
{
struct MHD_Daemon *d;
diff --git a/src/tests/unit/Makefile.am b/src/tests/unit/Makefile.am
@@ -30,13 +30,14 @@ endif
LDADD = $(MHD_LIBDEPS)
+# test_str_to_value
+
check_PROGRAMS = \
test_str_base64 \
test_str_bin_hex \
test_str_compare \
test_str_from_value \
test_str_quote \
- test_str_to_value \
test_str_token \
test_str_token_remove \
test_str_tokens_remove \
diff --git a/src/tests/unit/unit_md5.c b/src/tests/unit/unit_md5.c
@@ -258,6 +258,7 @@ test1_str (void)
(const uint8_t *) data_units1[i].str_l.str);
mhd_MD5_finish_reset (&ctx,
digest);
+#if MHD_MD5_EXTR
if (mhd_MD5_has_err (&ctx))
{
fprintf (stderr,
@@ -265,6 +266,7 @@ test1_str (void)
ctx.ext_error);
exit (99);
}
+#endif
num_failed += check_result (MHD_FUNC_,
i,
digest,
@@ -438,6 +440,7 @@ test1_bin (void)
data_units2[i].bin_l.bin);
mhd_MD5_finish_reset (&ctx,
digest);
+#if MHD_MD5_EXTR
if (mhd_MD5_has_err (&ctx))
{
fprintf (stderr,
@@ -445,6 +448,7 @@ test1_bin (void)
ctx.ext_error);
exit (99);
}
+#endif
num_failed += check_result (MHD_FUNC_,
i,
digest,
@@ -479,6 +483,7 @@ test2_str (void)
(const uint8_t *) data_units1[i].str_l.str + part_s);
mhd_MD5_finish_reset (&ctx,
digest);
+#if MHD_MD5_EXTR
if (mhd_MD5_has_err (&ctx))
{
fprintf (stderr,
@@ -486,6 +491,7 @@ test2_str (void)
ctx.ext_error);
exit (99);
}
+#endif
num_failed += check_result (MHD_FUNC_,
i,
digest,
@@ -518,6 +524,7 @@ test2_bin (void)
data_units2[i].bin_l.bin + part_s);
mhd_MD5_finish_reset (&ctx,
digest);
+#if MHD_MD5_EXTR
if (mhd_MD5_has_err (&ctx))
{
fprintf (stderr,
@@ -525,6 +532,7 @@ test2_bin (void)
ctx.ext_error);
exit (99);
}
+#endif
num_failed += check_result (MHD_FUNC_,
i,
digest,
@@ -575,6 +583,7 @@ test_unaligned (void)
unaligned_buf);
mhd_MD5_finish_reset (&ctx,
unaligned_digest);
+#if MHD_MD5_EXTR
if (mhd_MD5_has_err (&ctx))
{
fprintf (stderr,
@@ -582,6 +591,7 @@ test_unaligned (void)
ctx.ext_error);
exit (99);
}
+#endif
num_failed += check_result (MHD_FUNC_,
MAX_OFFSET - offset,
unaligned_digest,
diff --git a/src/tests/unit/unit_sha256.c b/src/tests/unit/unit_sha256.c
@@ -523,13 +523,13 @@ test2_str (void)
data_units1[i].str_l.len - part_s,
(const uint8_t *) data_units1[i].str_l.str + part_s);
mhd_SHA256_finish_reset (&ctx, digest);
-#ifdef MHD_SHA256_HAS_EXT_ERROR
+#ifdef MHD_SHA256_EXTR
if (0 != ctx.ext_error)
{
fprintf (stderr, "External hashing error: %d.\n", ctx.ext_error);
exit (99);
}
-#endif /* MHD_SHA256_HAS_EXT_ERROR */
+#endif
num_failed += check_result (MHD_FUNC_, i, digest,
data_units1[i].digest);
}
@@ -559,7 +559,7 @@ test2_bin (void)
data_units2[i].bin_l.bin + part_s);
mhd_SHA256_finish_reset (&ctx,
digest);
-#ifdef MHD_SHA256_HAS_EXT_ERROR
+#ifdef MHD_SHA256_EXTR
if (0 != ctx.ext_error)
{
fprintf (stderr,
@@ -567,7 +567,7 @@ test2_bin (void)
ctx.ext_error);
exit (99);
}
-#endif /* MHD_SHA256_HAS_EXT_ERROR */
+#endif /* MHD_SHA256_EXTR */
num_failed += check_result (MHD_FUNC_, i, digest,
data_units2[i].digest);
}
@@ -612,7 +612,7 @@ test_unaligned (void)
unaligned_buf);
mhd_SHA256_finish_reset (&ctx,
unaligned_digest);
-#ifdef MHD_SHA256_HAS_EXT_ERROR
+#ifdef MHD_SHA256_EXTR
if (0 != ctx.ext_error)
{
fprintf (stderr,
@@ -620,7 +620,7 @@ test_unaligned (void)
ctx.ext_error);
exit (99);
}
-#endif /* MHD_SHA256_HAS_EXT_ERROR */
+#endif /* MHD_SHA256_EXTR */
num_failed += check_result (MHD_FUNC_, MAX_OFFSET - offset,
unaligned_digest, tdata->digest);
}
