summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2021-09-19 01:35:24 +0200
committerBruno Haible <bruno@clisp.org>2021-09-19 01:35:43 +0200
commitd8a1c91c657909fc0b2148f9e47b6eb8ef79d8ad (patch)
tree6ce5ce0089efbd7a5558dc8736f27292d0ebf6a9
parent439979c0004197d6e0dd67c7807f57edacdf8a0d (diff)
downloadgnulib-d8a1c91c657909fc0b2148f9e47b6eb8ef79d8ad.tar.gz
md5-buffer tests: New module.
* tests/test-md5-buffer.c: New file, based on tests/test-md5.c. * tests/test-md5-stream.c: Renamed from tests/test-md5.c. (main): Remove md5-buffer tests. * modules/crypto/md5-buffer-tests: New file, based on modules/crypto/md5-tests. * modules/crypto/md5-tests: Remove tests that are now in modules/crypto/md5-buffer-tests. Test tests/test-md5-stream.c instead of tests/test-md5.c.
-rw-r--r--ChangeLog10
-rw-r--r--modules/crypto/md5-buffer-tests18
-rw-r--r--modules/crypto/md5-tests14
-rw-r--r--tests/test-md5-buffer.c (renamed from tests/test-md5.c)13
-rw-r--r--tests/test-md5-stream.c44
5 files changed, 76 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 13d6d4dbee..e709058cc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2021-09-18 Bruno Haible <bruno@clisp.org>
+ md5-buffer tests: New module.
+ * tests/test-md5-buffer.c: New file, based on tests/test-md5.c.
+ * tests/test-md5-stream.c: Renamed from tests/test-md5.c.
+ (main): Remove md5-buffer tests.
+ * modules/crypto/md5-buffer-tests: New file, based on
+ modules/crypto/md5-tests.
+ * modules/crypto/md5-tests: Remove tests that are now in
+ modules/crypto/md5-buffer-tests. Test tests/test-md5-stream.c instead
+ of tests/test-md5.c.
+
md5: Clarify module to source relation.
* lib/md5-stream.c: New file, extracted from lib/md5.c.
* lib/md5.c: Don't include stdlib.h, unlocked-io.h.
diff --git a/modules/crypto/md5-buffer-tests b/modules/crypto/md5-buffer-tests
new file mode 100644
index 0000000000..cc07337f08
--- /dev/null
+++ b/modules/crypto/md5-buffer-tests
@@ -0,0 +1,18 @@
+Files:
+tests/test-md5-buffer.c
+tests/bench-md5.c
+tests/bench-digest.h
+
+Depends-on:
+c99
+getrusage
+gettimeofday
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-md5-buffer
+check_PROGRAMS += test-md5-buffer
+noinst_PROGRAMS += bench-md5
+test_md5_buffer_LDADD = $(LDADD) @LIB_CRYPTO@
+bench_md5_LDADD = $(LDADD) @LIB_CRYPTO@
diff --git a/modules/crypto/md5-tests b/modules/crypto/md5-tests
index c1160f13d1..b2de00a548 100644
--- a/modules/crypto/md5-tests
+++ b/modules/crypto/md5-tests
@@ -1,20 +1,14 @@
Files:
-tests/test-md5.c
+tests/test-md5-stream.c
tests/test-digest.h
-tests/bench-md5.c
-tests/bench-digest.h
tests/macros.h
Depends-on:
c99
-getrusage
-gettimeofday
configure.ac:
Makefile.am:
-TESTS += test-md5
-check_PROGRAMS += test-md5
-noinst_PROGRAMS += bench-md5
-test_md5_LDADD = $(LDADD) @LIB_CRYPTO@
-bench_md5_LDADD = $(LDADD) @LIB_CRYPTO@
+TESTS += test-md5-stream
+check_PROGRAMS += test-md5-stream
+test_md5_stream_LDADD = $(LDADD) @LIB_CRYPTO@
diff --git a/tests/test-md5.c b/tests/test-md5-buffer.c
index c6c55ec8e9..7afc944a2e 100644
--- a/tests/test-md5.c
+++ b/tests/test-md5-buffer.c
@@ -22,14 +22,7 @@
#include "md5.h"
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-
-#include "macros.h"
-
-#define TESTFILE "test-md5.data"
-#include "test-digest.h"
int
main (void)
@@ -70,11 +63,5 @@ main (void)
return 1;
}
- /* Test md5_stream. */
- test_digest_on_files (md5_stream, "md5_stream", 16,
- "\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04\xe9\x80\x09\x98\xec\xf8\x42\x7e",
- "\x0d\x70\x06\xcd\x05\x5e\x94\xcf\x61\x45\x87\xe1\xd2\xae\x0c\x8e",
- "\xec\x99\x67\x9b\xff\xc0\xf9\xb0\x6d\x18\x30\x6b\x06\xd6\x56\x23");
-
return 0;
}
diff --git a/tests/test-md5-stream.c b/tests/test-md5-stream.c
new file mode 100644
index 0000000000..e506c4b78d
--- /dev/null
+++ b/tests/test-md5-stream.c
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2005, 2009-2021 Free Software Foundation, Inc.
+ * Written by Simon Josefsson
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Simon Josefsson. */
+
+#include <config.h>
+
+#include "md5.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "macros.h"
+
+#define TESTFILE "test-md5.data"
+#include "test-digest.h"
+
+int
+main (void)
+{
+ /* Test md5_stream. */
+ test_digest_on_files (md5_stream, "md5_stream", 16,
+ "\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04\xe9\x80\x09\x98\xec\xf8\x42\x7e",
+ "\x0d\x70\x06\xcd\x05\x5e\x94\xcf\x61\x45\x87\xe1\xd2\xae\x0c\x8e",
+ "\xec\x99\x67\x9b\xff\xc0\xf9\xb0\x6d\x18\x30\x6b\x06\xd6\x56\x23");
+
+ return 0;
+}