aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-08-18 16:09:31 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-08-18 22:53:32 +0200
commit50385e06ec207af0171c021f1909e9ef38c00519 (patch)
tree690bfe53cef9f901c68f76f4fe50c1917e368fe2 /tests
parent58c5d7c933a714096ef0dd42bd1446a6e1a25a16 (diff)
Replace update_crc32 helper function with crc32 from zlib
It is optimized to the maximum and if we already use zlib anyway, why not use zlib crc32? This also makes zlib a hard dependency which also means the whole "do we have a compressor" sanity check in the build system can be removed. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makemodule.am7
-rw-r--r--tests/crc32.c40
2 files changed, 2 insertions, 45 deletions
diff --git a/tests/Makemodule.am b/tests/Makemodule.am
index e681a33..60312dc 100644
--- a/tests/Makemodule.am
+++ b/tests/Makemodule.am
@@ -73,15 +73,12 @@ test_str_table_SOURCES = tests/str_table.c
test_str_table_LDADD = libutil.a
test_str_table_CPPFLAGS = $(AM_CPPFLAGS) -DTESTPATH=$(top_srcdir)/tests
-test_crc32_SOURCES = tests/crc32.c
-test_crc32_LDADD = libutil.a
-
check_PROGRAMS += test_canonicalize_name test_mknode_simple test_mknode_slink
check_PROGRAMS += test_mknode_reg test_mknode_dir test_gen_inode_table
check_PROGRAMS += test_add_by_path test_get_path test_fstree_sort
check_PROGRAMS += test_fstree_from_file test_fstree_init test_fstree_xattr
check_PROGRAMS += test_tar_ustar test_tar_pax test_tar_gnu test_tar_sparse_gnu
-check_PROGRAMS += test_tar_sparse_gnu1 test_tar_sparse_gnu2 test_crc32
+check_PROGRAMS += test_tar_sparse_gnu1 test_tar_sparse_gnu2
check_PROGRAMS += test_tar_xattr_bsd test_tar_xattr_schily test_str_table
TESTS += test_canonicalize_name test_mknode_simple test_mknode_slink
@@ -90,6 +87,6 @@ TESTS += test_add_by_path test_get_path test_fstree_sort test_fstree_from_file
TESTS += test_fstree_init test_fstree_xattr test_tar_ustar test_tar_pax
TESTS += test_tar_gnu test_tar_sparse_gnu test_tar_sparse_gnu1
TESTS += test_tar_sparse_gnu2 test_tar_xattr_bsd test_tar_xattr_schily
-TESTS += test_str_table test_crc32
+TESTS += test_str_table
EXTRA_DIST += $(top_srcdir)/tests/tar $(top_srcdir)/tests/words.txt
diff --git a/tests/crc32.c b/tests/crc32.c
deleted file mode 100644
index 669c6a4..0000000
--- a/tests/crc32.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
-/*
- * crc32.c
- *
- * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
- */
-#include "config.h"
-#include "util.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-static const struct {
- const char *str;
- uint32_t result;
-} test_vectors[] = {
- { "", 0 },
- { "Hello, World!", 0xEC4AC3D0 },
- { "The quick brown fox jumps over the lazy dog", 0x414FA339 },
-};
-
-int main(void)
-{
- uint32_t crc;
- size_t i;
-
- for (i = 0; i < sizeof(test_vectors) / sizeof(test_vectors[0]); ++i) {
- crc = update_crc32(0, test_vectors[i].str,
- strlen(test_vectors[i].str));
-
- if (crc != test_vectors[i].result) {
- fprintf(stderr, "Case %zu failed: %08X != %08X\n", i,
- crc, test_vectors[i].result);
- return EXIT_FAILURE;
- }
- }
-
- return EXIT_SUCCESS;
-}