From 759ebcb57db73449b5670204f85931d34881b7d2 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 16 Sep 2012 22:31:04 +0200 Subject: factor: merge with preexisting factor; integrate tests; avoid warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * src/factor.c: Renamed from factor-ng.c, with the following changes: Adjust copyright header to be consistent with others. Use xmalloc and xrealloc, to avoid segv upon OOM. Switch back to using readtokens to handle input. Diagnose invalid inputs. s/fprintf+exit/error/ (print_factors): Add comments. (strto2uintmax): Return strtol_error, not int. (read_item): Remove, no longer used. (main): Use atexit(close_stdout) so that we don't ignore failed write. * cfg.mk: Exempt src/longlong.h from several tests. Exempt run.sh from the test-list-consistency test. Exempt make-prime-list.c from numerous tests, since we won't be making it conform: it must not link with libcoreutils.a. Exempt factor-ng.c from the no-upper-case error message test. * AUTHORS (factor): Add Torbjörn and Niels. * tests/local.mk (factor_tests): Encode the 37 tests. ($(factor_tests)): Rule to generate a test script for each test. * tests/factor/run.sh: New script, marked as very expensive. * .gitignore: Ignore new generated files. * src/local.mk (src/primes.h): New rule. (noinst_PROGRAMS): Add make-prime-list. (noinst_HEADERS): Add longlong.h. Remove all wheel-related rules and files. * src/wheel-gen.pl: Remove file. maint: mark set-but-not-used variables with ATTRIBUTE_UNUSED * src/factor-ng.c (redcify, prime_p, isqrt2): Mark them, so we don't have to disable -Wunused-but-set-variable. maint: use __builtin_expect only if __GNUC__ * src/factor-ng.c (LIKELY, UNLIKELY) [__GNUC__]: Add #ifdef guard. build: avoid warning about unused macro * src/factor-ng.c (__GMP_DECLSPEC): Don't define here * src/longlong.h (__GMP_DECLSPEC): Define if not already defined. --- tests/local.mk | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 4 deletions(-) (limited to 'tests/local.mk') diff --git a/tests/local.mk b/tests/local.mk index 0b6d576f8..486bf312b 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -16,9 +16,9 @@ ## along with this program. If not, see . # Indirections required so that we'll still be able to know the -# complete list of our tests even if the user override TESTS from the -# command line (which he's allowed to do by the test harness API). -TESTS = $(all_tests) +# complete list of our tests even if the user overrides TESTS +# from the command line (as permitted by the test harness API). +TESTS = $(all_tests) $(factor_tests) root_tests = $(all_root_tests) EXTRA_DIST += $(all_tests) @@ -89,14 +89,15 @@ TESTS_ENVIRONMENT = \ VERBOSE = yes EXTRA_DIST += \ + init.cfg \ tests/Coreutils.pm \ tests/CuSkip.pm \ tests/CuTmpdir.pm \ tests/d_type-check \ tests/envvar-check \ + tests/factor/run.sh \ tests/filefrag-extent-compare \ tests/fiemap-capable \ - init.cfg \ tests/init.sh \ tests/lang-default \ tests/no-perl \ @@ -624,6 +625,68 @@ all_tests = \ tests/touch/trailing-slash.sh \ $(all_root_tests) +# prefix of 2^64 +p = 184467440737 +# prefix of 2^96 +q = 79228162514264337593543 + +# Each of these numbers has a Pollard rho factor larger than 2^64, +# and thus exercises some hard-to-reach code in factor.c. +t1 = 170141183460469225450570946617781744489 +t2 = 170141183460469229545748130981302223887 +# Factors of the above: +# t1: 9223372036854775421 18446744073709551709 +# t2: 9223372036854775643 18446744073709551709 + +# Each tests is a triple: lo, hi, sha1 of result. +# The test script, run.sh, runs seq lo hi|factor|sha1sum +# and verifies that the actual and expected checksums are the same. +tf = tests/factor +factor_tests = \ + $(tf)/0-10000000-a451244522b1b662c86cb3cbb55aee3e085a61a0.sh \ + $(tf)/10000000-20000000-c792a2e02f1c8536b5121f624b04039d20187016.sh \ + $(tf)/20000000-30000000-8115e8dff97d1674134ec054598d939a2a5f6113.sh \ + $(tf)/30000000-40000000-fe7b832c8e0ed55035152c0f9ebd59de73224a60.sh \ + $(tf)/40000000-50000000-b8786d66c432e48bc5b342ee3c6752b7f096f206.sh \ + $(tf)/50000000-60000000-a74fe518c5f79873c2b9016745b88b42c8fd3ede.sh \ + $(tf)/60000000-70000000-689bc70d681791e5d1b8ac1316a05d0c4473d6db.sh \ + $(tf)/70000000-80000000-d370808f2ab8c865f64c2ff909c5722db5b7d58d.sh \ + $(tf)/80000000-90000000-7978aa66bf2bdb446398336ea6f02605e9a77581.sh \ + $(tf)/$(t1)-$(t1)-4622287c5f040cdb7b3bbe4d19d29a71ab277827.sh \ + $(tf)/$(t2)-$(t2)-dea308253708b57afad357e8c0d2a111460ef50e.sh \ + $(tf)/$(p)08551616-$(p)08651615-66c57cd58f4fb572df7f088d17e4f4c1d4f01bb1.sh \ + $(tf)/$(p)08651616-$(p)08751615-729228e693b1a568ecc85b199927424c7d16d410.sh \ + $(tf)/$(p)08751616-$(p)08851615-5a0c985017c2d285e4698f836f5a059e0b684563.sh \ + $(tf)/$(p)08851616-$(p)08951615-0482295c514e371c98ce9fd335deed0c9c44a4f4.sh \ + $(tf)/$(p)08951616-$(p)09051615-9c0e1105ac7c45e27e7bbeb5e213f530d2ad1a71.sh \ + $(tf)/$(p)09051616-$(p)09151615-604366d2b1d75371d0679e6a68962d66336cd383.sh \ + $(tf)/$(p)09151616-$(p)09251615-9192d2bdee930135b28d7160e6d395a7027871da.sh \ + $(tf)/$(p)09251616-$(p)09351615-bcf56ae55d20d700690cff4d3327b78f83fc01bf.sh \ + $(tf)/$(p)09351616-$(p)09451615-16b106398749e5f24d278ba7c58229ae43f650ac.sh \ + $(tf)/$(p)09451616-$(p)09551615-ad2c6ed63525f8e7c83c4c416e7715fa1bebc54c.sh \ + $(tf)/$(p)09551616-$(p)09651615-2b6f9c11742d9de045515a6627c27a042c49f8ba.sh \ + $(tf)/$(p)09651616-$(p)09751615-54851acd51c4819beb666e26bc0100dc9adbc310.sh \ + $(tf)/$(p)09751616-$(p)09851615-6939c2a7afd2d81f45f818a159b7c5226f83a50b.sh \ + $(tf)/$(p)09851616-$(p)09951615-0f2c8bc011d2a45e2afa01459391e68873363c6c.sh \ + $(tf)/$(p)09951616-$(p)10051615-630dc2ad72f4c222bad1405e6c5bea590f92a98c.sh \ + $(tf)/$(q)940336-$(q)942335-63cbd6313d78247b04d63bbbac50cb8f8d33ff71.sh \ + $(tf)/$(q)942336-$(q)944335-0d03d63653767173182491b86fa18f8f680bb036.sh \ + $(tf)/$(q)944336-$(q)946335-ca43bd38cd9f97cc5bb63613cb19643578640f0b.sh \ + $(tf)/$(q)946336-$(q)948335-86d59545a0c13567fa96811821ea5cde950611b1.sh \ + $(tf)/$(q)948336-$(q)950335-c3740e702fa9c97e6cf00150860e0b936a141a6b.sh \ + $(tf)/$(q)950336-$(q)952335-551c3c4c4640d86fda311b5c3006dac45505c0ce.sh \ + $(tf)/$(q)952336-$(q)954335-b1b0b00463c2f853d70ef9c4f7a96de5cb614156.sh \ + $(tf)/$(q)954336-$(q)956335-8938a484a9ef6bb16478091d294fcde9f8ecea69.sh \ + $(tf)/$(q)956336-$(q)958335-d1ae6bc712d994f35edf55c785d71ddf31f16535.sh \ + $(tf)/$(q)958336-$(q)960335-2374919a89196e1fce93adfe779cb4664556d4b6.sh \ + $(tf)/$(q)960336-$(q)962335-569e4363e8d9e8830a187d9ab27365eef08abde1.sh + +$(factor_tests): tests/factor/run.sh + $(AM_V_GEN)$(MKDIR_P) $(tf) + $(AM_V_at)ln -f $(srcdir)/tests/factor/run.sh $@ + +CLEANFILES += $(factor_tests) + pr_data = \ tests/pr/0F \ tests/pr/0FF \ -- cgit v1.2.3-54-g00ecf