diff options
author | Jim Meyering <meyering@redhat.com> | 2012-09-16 22:31:04 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2012-10-04 22:06:40 +0200 |
commit | 759ebcb57db73449b5670204f85931d34881b7d2 (patch) | |
tree | 0c72d5266451db1dca993ed5034d8b323a73cf1b /cfg.mk | |
parent | 49f5c21fff9241c195d74101a334fdc2c8dc33e8 (diff) | |
download | coreutils-759ebcb57db73449b5670204f85931d34881b7d2.tar.xz |
factor: merge with preexisting factor; integrate tests; avoid warnings
* 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.
Diffstat (limited to 'cfg.mk')
-rw-r--r-- | cfg.mk | 23 |
1 files changed, 17 insertions, 6 deletions
@@ -111,7 +111,7 @@ sc_tests_list_consistency: for t in $(all_tests); do echo $$t; done; \ cd $(top_srcdir); \ $(SHELL) build-aux/vc-list-files tests \ - | grep -v '^tests/init\.sh$$' \ + | grep -Ev '^tests/(factor/run|init)\.sh$$' \ | $(EGREP) "$$test_extensions_rx\$$"; \ } | sort | uniq -u | grep . && exit 1; : @@ -515,10 +515,11 @@ update-copyright-env = \ # List syntax-check exemptions. exclude_file_name_regexp--sc_space_tab = \ ^(tests/pr/|tests/misc/nl\.sh$$|gl/.*\.diff$$) -exclude_file_name_regexp--sc_bindtextdomain = ^(gl/.*|lib/euidaccess-stat)\.c$$ +exclude_file_name_regexp--sc_bindtextdomain = \ + ^(gl/.*|lib/euidaccess-stat|src/make-prime-list)\.c$$ exclude_file_name_regexp--sc_trailing_blank = ^tests/pr/ exclude_file_name_regexp--sc_system_h_headers = \ - ^src/((system|copy)\.h|libstdbuf\.c)$$ + ^src/((system|copy)\.h|libstdbuf\.c|make-prime-list\.c)$$ _src = (false|lbracket|ls-(dir|ls|vdir)|tac-pipe|uname-(arch|uname)) exclude_file_name_regexp--sc_require_config_h_first = \ @@ -530,7 +531,8 @@ exclude_file_name_regexp--sc_po_check = ^gl/ exclude_file_name_regexp--sc_prohibit_always-defined_macros = \ ^src/(seq|remove)\.c$$ exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^tests/pr/ -exclude_file_name_regexp--sc_program_name = ^(gl/.*|lib/euidaccess-stat)\.c$$ +exclude_file_name_regexp--sc_program_name = \ + ^(gl/.*|lib/euidaccess-stat|src/make-prime-list)\.c$$ exclude_file_name_regexp--sc_file_system = \ NEWS|^(init\.cfg|src/df\.c|tests/df/df-P\.sh)$$ exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \ @@ -539,14 +541,20 @@ exclude_file_name_regexp--sc_prohibit_fail_0 = \ (^.*/git-hooks/commit-msg|^tests/init\.sh|Makefile\.am|\.mk|.*\.texi)$$ exclude_file_name_regexp--sc_prohibit_atoi_atof = ^lib/euidaccess-stat\.c$$ +# longlong.h is maintained elsewhere. +_ll = ^src/longlong\.h$$ +exclude_file_name_regexp--sc_useless_cpp_parens = $(_ll) +exclude_file_name_regexp--sc_long_lines = $(_ll) +exclude_file_name_regexp--sc_space_before_open_paren = $(_ll) + tbi_1 = ^tests/pr/|(^gl/lib/reg.*\.c\.diff|\.mk|^man/help2man)$$ tbi_2 = ^scripts/git-hooks/(pre-commit|pre-applypatch|applypatch-msg)$$ -tbi_3 = (GNU)?[Mm]akefile(\.am)?$$ +tbi_3 = (GNU)?[Mm]akefile(\.am)?$$|$(_ll) exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \ $(tbi_1)|$(tbi_2)|$(tbi_3) exclude_file_name_regexp--sc_preprocessor_indentation = \ - ^(gl/lib/rand-isaac\.[ch]|gl/tests/test-rand-isaac\.c)$$ + ^(gl/lib/rand-isaac\.[ch]|gl/tests/test-rand-isaac\.c)$$|$(__ll) exclude_file_name_regexp--sc_prohibit_stat_st_blocks = \ ^(src/system\.h|tests/du/2g\.sh)$$ @@ -560,6 +568,9 @@ exclude_file_name_regexp--sc_prohibit_test_backticks = \ exclude_file_name_regexp--sc_prohibit_operator_at_end_of_line = \ ^src/(ptx|test|head)\.c$$ +exclude_file_name_regexp--sc_error_message_uppercase = ^src/factor\.c$$ +exclude_file_name_regexp--sc_prohibit_atoi_atof = ^src/make-prime-list\.c$$ + # Augment AM_CFLAGS to include our per-directory options: AM_CFLAGS += $($(@D)_CFLAGS) |