FYI, some house cleaning, consistency fixes. Now "make distcheck" passes again.
>From 0ffe188b2bc56ebeb54dcefbb24d64849f20df1b Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sat, 4 Sep 2010 08:53:28 +0200 Subject: [PATCH 1/5] build: update gnulib submodule to latest --- gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gnulib b/gnulib index 0c6cf5a..9f0cd59 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 0c6cf5ab43555377b99d94febb2d6f23fc3d2cb0 +Subproject commit 9f0cd590f76f5e5e942fbd90b253c90ca7c80699 -- 1.7.2.2.566.g36af9 >From 0d0c959471b898f18166f65dcb164c7b602a416c Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sat, 4 Sep 2010 08:54:18 +0200 Subject: [PATCH 2/5] build: update build/test tools from gnulib * bootstrap: Update from gnulib. * tests/init.sh: Likewise. --- bootstrap | 17 +++++--- tests/init.sh | 134 +++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 104 insertions(+), 47 deletions(-) diff --git a/bootstrap b/bootstrap index e55b3d2..5ab4cf7 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2010-04-30.16; # UTC +scriptversion=2010-07-06.10; # UTC # Bootstrap this package from checked-out sources. @@ -90,7 +90,8 @@ bootstrap_epilogue() { :; } # options because the latest/%s directory and the .po files within are # all symlinks. po_download_command_format=\ -"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'" +"rsync --delete --exclude '*.s1' -Lrtvz \ + 'translationproject.org::tp/latest/%s/' '%s'" extract_package_name=' /^AC_INIT(/{ @@ -409,6 +410,7 @@ git_modules_config () { } gnulib_path=`git_modules_config submodule.gnulib.path` +: ${gnulib_path=gnulib} # Get gnulib files. @@ -424,7 +426,8 @@ case ${GNULIB_SRCDIR--} in trap cleanup_gnulib 1 2 13 15 - git clone -h|grep -- --depth > /dev/null && shallow='--depth 2' || shallow= + shallow= + git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2' git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" || cleanup_gnulib @@ -473,22 +476,24 @@ download_po_files() { eval "$cmd" } -# Download .po files to $po_dir/.reference and copy only the new +# Mirror .po files to $po_dir/.reference and copy only the new # or modified ones into $po_dir. Also update $po_dir/LINGUAS. +# Note po files that exist locally only are left in $po_dir but will +# not be included in LINGUAS and hence will not be distributed. update_po_files() { # Directory containing primary .po files. # Overwrite them only when we're sure a .po file is new. po_dir=$1 domain=$2 - # Download *.po files into this dir. + # Mirror *.po files into this dir. # Usually contains *.s1 checksum files. ref_po_dir="$po_dir/.reference" test -d $ref_po_dir || mkdir $ref_po_dir || return download_po_files $ref_po_dir $domain \ && ls "$ref_po_dir"/*.po 2>/dev/null | - sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" + sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'` test "$langs" = '*' && langs=x diff --git a/tests/init.sh b/tests/init.sh index 512e876..fe2c224 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -21,11 +21,16 @@ # The typical skeleton of a test looks like this: # # #!/bin/sh -# : ${srcdir=.} -# . "$srcdir/init.sh"; path_prepend_ . +# . "${srcdir=.}/init.sh"; path_prepend_ . # Execute some commands. # Note that these commands are executed in a subdirectory, therefore you # need to prepend "../" to relative filenames in the build directory. +# Note that the "path_prepend_ ." is useful only if the body of your +# test invokes programs residing in the initial directory. +# For example, if the programs you want to test are in src/, and this test +# script is named tests/test-1, then you would use "path_prepend_ ../src", +# or perhaps export PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" +# to all tests via automake's TESTS_ENVIRONMENT. # Set the exit code 0 for success, 77 for skipped, or 1 or other for failure. # Use the skip_ and fail_ functions to print a diagnostic and then exit # with the corresponding exit code. @@ -52,71 +57,116 @@ # 4. Finally # $ exit +ME_=`expr "./$0" : '.*/\(.*\)$'` + +# We use a trap below for cleanup. This requires us to go through +# hoops to get the right exit status transported through the handler. +# So use `Exit STATUS' instead of `exit STATUS' inside of the tests. +# Turn off errexit here so that we don't trip the bug with OSF1/Tru64 +# sh inside this function. +Exit () { set +e; (exit $1); exit $1; } + +# Print warnings (e.g., about skipped and failed tests) to this file number. +# Override by defining to say, 9, in init.cfg, and putting say, +# "export ...ENVVAR_SETTINGS...; exec 9>&2; $(SHELL)" in the definition +# of TESTS_ENVIRONMENT in your tests/Makefile.am file. +# This is useful when using automake's parallel tests mode, to print +# the reason for skip/failure to console, rather than to the .log files. +: ${stderr_fileno_=2} + +warn_() { echo "$@" 1>&$stderr_fileno_; } +fail_() { warn_ "$ME_: failed test: $@"; Exit 1; } +skip_() { warn_ "$ME_: skipped test: $@"; Exit 77; } +framework_failure_() { warn_ "$ME_: set-up failure: $@"; Exit 99; } + +# Sanitize this shell to POSIX mode, if possible. +DUALCASE=1; export DUALCASE +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; + esac +fi + # We require $(...) support unconditionally. # We require a few additional shell features only when $EXEEXT is nonempty, # in order to support automatic $EXEEXT emulation: # - hyphen-containing alias names # - we prefer to use ${var#...} substitution, rather than having # to work around lack of support for that feature. -# The following code attempts to find a shell with support for these features -# and re-exec's it. If not, it skips the current test. +# The following code attempts to find a shell with support for these features. +# If the current shell passes the test, we're done. Otherwise, test other +# shells until we find one that passes. If one is found, re-exec it. +# If no acceptable shell is found, skip the current test. +# +# Use "9" to indicate success (rather than 0), in case some shell acts +# like Solaris 10's /bin/sh but exits successfully instead of with status 2. gl_shell_test_script_=' test $(echo y) = y || exit 1 -test -z "$EXEEXT" && exit 0 +test -z "$EXEEXT" && exit 9 shopt -s expand_aliases alias a-b="echo zoo" v=abx test ${v%x} = ab \ && test ${v#a} = bx \ - && test $(a-b) = zoo + && test $(a-b) = zoo \ + && exit 9 ' if test "x$1" = "x--no-reexec"; then shift else - for re_shell_ in "${CONFIG_SHELL:-no_shell}" /bin/sh bash dash zsh pdksh fail - do - test "$re_shell_" = no_shell && continue - test "$re_shell_" = fail && skip_ failed to find an adequate shell - if "$re_shell_" -c "$gl_shell_test_script_" 2>/dev/null; then - exec "$re_shell_" "$0" --no-reexec "$@" - echo "$ME_: exec failed" 1>&2 - exit 127 - fi - done + # 'eval'ing the above code makes Solaris 10's /bin/sh exit with $? set to 2. + # It does not evaluate any of the code after the "unexpected" `('. Thus, + # we must run it in a subshell. + ( eval "$gl_shell_test_script_" ) > /dev/null 2>&1 + if test $? = 9; then + : # The current shell is adequate. No re-exec required. + else + # Search for a shell that meets our requirements. + for re_shell_ in "${CONFIG_SHELL:-no_shell}" /bin/sh bash dash zsh pdksh fail + do + test "$re_shell_" = no_shell && continue + test "$re_shell_" = fail && skip_ failed to find an adequate shell + "$re_shell_" -c "$gl_shell_test_script_" 2>/dev/null + if test $? = 9; then + # Found an acceptable shell. Preserve -v and -x. + case $- in + *v*x* | *x*v*) opts_=-vx ;; + *v*) opts_=-v ;; + *x*) opts_=-x ;; + *) opts_= ;; + esac + exec "$re_shell_" $opts_ "$0" --no-reexec "$@" + echo "$ME_: exec failed" 1>&2 + exit 127 + fi + done + fi fi test -n "$EXEEXT" && shopt -s expand_aliases -# We use a trap below for cleanup. This requires us to go through -# hoops to get the right exit status transported through the handler. -# So use `Exit STATUS' instead of `exit STATUS' inside of the tests. -# Turn off errexit here so that we don't trip the bug with OSF1/Tru64 -# sh inside this function. -Exit () { set +e; (exit $1); exit $1; } - -# Print warnings (e.g., about skipped and failed tests) to this file number. -# Override by defining to say, 9, in init.cfg, and putting say, -# "export ...ENVVAR_SETTINGS...; exec 9>&2; $(SHELL)" in the definition -# of TESTS_ENVIRONMENT in your tests/Makefile.am file. -# This is useful when using automake's parallel tests mode, to print -# the reason for skip/failure to console, rather than to the .log files. -: ${stderr_fileno_=2} - -warn_() { echo "$@" 1>&$stderr_fileno_; } -fail_() { warn_ "$ME_: failed test: $@"; Exit 1; } -skip_() { warn_ "$ME_: skipped test: $@"; Exit 77; } -framework_failure_() { warn_ "$ME_: set-up failure: $@"; Exit 1; } +# Enable glibc's malloc-perturbing option. +# This is cheap and useful for exposing code that depends on the fact that +# malloc-related functions often return memory that is mostly zeroed. +# If you have the time and cycles, use valgrind to do an even better job. +: ${MALLOC_PERTURB_=87} +export MALLOC_PERTURB_ # This is a stub function that is run upon trap (upon regular exit and # interrupt). Override it with a per-test function, e.g., to unmount # a partition, or to undo any other global state changes. cleanup_() { :; } -if ( diff --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then +if ( diff --version < /dev/null 2>&1 | grep GNU ) > /dev/null 2>&1; then compare() { diff -u "$@"; } -elif ( cmp --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then +elif ( cmp --version < /dev/null 2>&1 | grep GNU ) > /dev/null 2>&1; then compare() { cmp -s "$@"; } else compare() { cmp "$@"; } @@ -218,16 +268,15 @@ setup_() test "$VERBOSE" = yes && set -x initial_cwd_=$PWD - ME_=`expr "./$0" : '.*/\(.*\)$'` pfx_=`testdir_prefix_` test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \ || fail_ "failed to create temporary directory in $initial_cwd_" cd "$test_dir_" - # These trap statements ensure that the temporary directory, $test_dir_, - # is removed upon exit as well as upon receipt of any of the listed signals. - trap remove_tmp_ 0 + # This trap statement, along with a trap on 0 below, ensure that the + # temporary directory, $test_dir_, is removed upon exit as well as + # upon receipt of any of the listed signals. for sig_ in 1 2 3 13 15; do eval "trap 'Exit $(expr $sig_ + 128)' $sig_" done @@ -355,3 +404,6 @@ test -f "$srcdir/init.cfg" \ && . "$srcdir/init.cfg" setup_ "$@" +# This trap is here, rather than in the setup_ function, because some +# shells run the exit trap at shell function exit, rather than script exit. +trap remove_tmp_ 0 -- 1.7.2.2.566.g36af9 >From edf0032df445a519b503f72147fa3f846983df56 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sat, 4 Sep 2010 08:55:48 +0200 Subject: [PATCH 3/5] build: use gettext-h, not gettext * bootstrap.conf (gnulib_modules): Use gettext-h, not gettext. The latter is overkill for a package that uses AM_GNU_GETTEXT([external]... --- bootstrap.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index ea1744c..a6221db 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -36,7 +36,7 @@ file-type filenamecat fnmatch-gnu getopt -gettext +gettext-h gettime git-version-gen gitlog-to-changelog -- 1.7.2.2.566.g36af9 >From d5d4b828b46628977ec5b75d731649c65f8e1bf2 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sat, 4 Sep 2010 09:04:43 +0200 Subject: [PATCH 4/5] maint: avoid shadowing warning * src/dir.c (diff_dirs): Rename shadowed local cmp to "c". --- src/dir.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dir.c b/src/dir.c index 1b078ab..df89431 100644 --- a/src/dir.c +++ b/src/dir.c @@ -275,10 +275,10 @@ diff_dirs (struct comparison const *cmp, *p && compare_names (*p, greater_name) == 0; p++) { - int cmp = file_name_cmp (*p, greater_name); - if (0 <= cmp) + int c = file_name_cmp (*p, greater_name); + if (0 <= c) { - if (cmp == 0) + if (c == 0) { memmove (lesser + 1, lesser, (char *) p - (char *) lesser); -- 1.7.2.2.566.g36af9 >From 361b3b13da25366256745b7cce4ff71231ef24e9 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sat, 4 Sep 2010 09:08:08 +0200 Subject: [PATCH 5/5] maint: adjust init.sh use to conform * tests/help-version: Use one line: "${srcdir=.}/init.sh"; ... * tests/basic: Likewise. * tests/binary: Likewise. * tests/colliding-file-names: Likewise. * tests/excess-slash: Likewise. * tests/function-line-vs-leading-space: Likewise. * tests/help-version: Likewise. * tests/label-vs-func: Likewise. * tests/no-newline-at-eof: Likewise. * tests/stdin: Likewise. --- tests/basic | 3 +-- tests/binary | 3 +-- tests/colliding-file-names | 3 +-- tests/excess-slash | 3 +-- tests/function-line-vs-leading-space | 3 +-- tests/help-version | 3 +-- tests/label-vs-func | 3 +-- tests/no-newline-at-eof | 3 +-- tests/stdin | 3 +-- 9 files changed, 9 insertions(+), 18 deletions(-) diff --git a/tests/basic b/tests/basic index bfee8bd..c1475b3 100755 --- a/tests/basic +++ b/tests/basic @@ -1,8 +1,7 @@ #!/bin/sh # small examples -: ${srcdir=.} -. "$srcdir/init.sh"; path_prepend_ ../src +. "${srcdir=.}/init.sh"; path_prepend_ ../src fail=0 diff --git a/tests/binary b/tests/binary index c66ea04..e163f01 100644 --- a/tests/binary +++ b/tests/binary @@ -1,8 +1,7 @@ #!/bin/sh # small examples -: ${srcdir=.} -. "$srcdir/init.sh"; path_prepend_ ../src +. "${srcdir=.}/init.sh"; path_prepend_ ../src printf 'Binary files - and /dev/null differ\n' > out-exp || fail_ setup diff --git a/tests/colliding-file-names b/tests/colliding-file-names index f14dce7..c05401a 100644 --- a/tests/colliding-file-names +++ b/tests/colliding-file-names @@ -2,8 +2,7 @@ # Check that diff responds well if a directory has multiple file names # that compare equal. -: ${srcdir=.} -. "$srcdir/init.sh"; path_prepend_ ../src +. "${srcdir=.}/init.sh"; path_prepend_ ../src mkdir d1 d2 || fail=1 diff --git a/tests/excess-slash b/tests/excess-slash index 3ef34cc..32ffc89 100644 --- a/tests/excess-slash +++ b/tests/excess-slash @@ -1,8 +1,7 @@ #!/bin/sh # Ensure that no excess slash appears in diff -r output. -: ${srcdir=.} -. "$srcdir/init.sh"; path_prepend_ ../src +. "${srcdir=.}/init.sh"; path_prepend_ ../src mkdir -p a/f b/f/g || framework_failure_ echo Only in b/f: g > expected-out || framework_failure_ diff --git a/tests/function-line-vs-leading-space b/tests/function-line-vs-leading-space index 62fd021..9143e02 100755 --- a/tests/function-line-vs-leading-space +++ b/tests/function-line-vs-leading-space @@ -1,8 +1,7 @@ #!/bin/sh # Demonstrate how -F RE behavior changed after diff-2.9. -: ${srcdir=.} -. "$srcdir/init.sh"; path_prepend_ ../src +. "${srcdir=.}/init.sh"; path_prepend_ ../src cat <<EOF > in || fail_ "failed to create temporary file" procedure AdaCode is diff --git a/tests/help-version b/tests/help-version index 9d7d11d..64137ba 100755 --- a/tests/help-version +++ b/tests/help-version @@ -23,8 +23,7 @@ test "x$SHELL" = x && SHELL=/bin/sh export SHELL -: ${srcdir=.} -. "$srcdir/init.sh"; path_prepend_ ../src +. "${srcdir=.}/init.sh"; path_prepend_ ../src expected_failure_status_chroot=125 expected_failure_status_env=125 diff --git a/tests/label-vs-func b/tests/label-vs-func index 2026b0a..bb2873e 100755 --- a/tests/label-vs-func +++ b/tests/label-vs-func @@ -1,8 +1,7 @@ #!/bin/sh # Show how diff's -p option can mistakenly match a label: in column 1. -: ${srcdir=.} -. "$srcdir/init.sh"; path_prepend_ ../src +. "${srcdir=.}/init.sh"; path_prepend_ ../src fail=0 cat <<EOF > exp || fail=1 diff --git a/tests/no-newline-at-eof b/tests/no-newline-at-eof index e5dc89d..6052206 100644 --- a/tests/no-newline-at-eof +++ b/tests/no-newline-at-eof @@ -3,8 +3,7 @@ # Before the April 2010 fix, the "\ No newline at end of file" # line would not be printed. -: ${srcdir=.} -. "$srcdir/init.sh"; path_prepend_ ../src +. "${srcdir=.}/init.sh"; path_prepend_ ../src printf '\n1' > a || framework_failure_ printf '\n0\n\n1' > b || framework_failure_ diff --git a/tests/stdin b/tests/stdin index 66ef2bb..1f006a1 100755 --- a/tests/stdin +++ b/tests/stdin @@ -1,8 +1,7 @@ #!/bin/sh # Ensure that "-" means "standard input". -: ${srcdir=.} -. "$srcdir/init.sh"; path_prepend_ ../src +. "${srcdir=.}/init.sh"; path_prepend_ ../src fail=0 -- 1.7.2.2.566.g36af9
