Imported Upstream version 1.2.6

diff --git a/ChangeLog b/ChangeLog
index bcf0ac2..a70df17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2013-12-18  Colin Watson  <cjwatson@debian.org>
+
+       Version: 1.2.6.
+
+       * lib/Makefile.am (libpipeline_la_LDFLAGS): Bump -version-info to
+         3:6:2.
+
+2013-12-18  Colin Watson  <cjwatson@debian.org>
+
+       Fix occasional failure in test_pump_tee
+
+       * tests/pump.c (test_pump_tee): Wait for child processes before
+       testing output.
+       * NEWS: Document this.
+
+2013-12-18  Colin Watson  <cjwatson@debian.org>
+
+       Clarify pipeline_wait's return value
+
+       * man/libpipeline.3 (pipeline_wait): Synchronise description of
+       return value with pipeline.h.
+
 2013-12-03  Colin Watson  <cjwatson@debian.org>
 
        Version: 1.2.5.

diff --git a/NEWS b/NEWS
index 31fc3e6..d629792 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+libpipeline 1.2.6 (18 December 2013)
+====================================
+
+Fix test_pump_tee to wait for its child processes before testing their
+output, since otherwise not all their output might be flushed.
+
 libpipeline 1.2.5 (3 December 2013)
 ===================================
 

diff --git a/configure b/configure
index cefec89..e38f8e2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libpipeline 1.2.5.
+# Generated by GNU Autoconf 2.69 for libpipeline 1.2.6.
 #
 # Report bugs to <cjwatson@debian.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libpipeline'
 PACKAGE_TARNAME='libpipeline'
-PACKAGE_VERSION='1.2.5'
-PACKAGE_STRING='libpipeline 1.2.5'
+PACKAGE_VERSION='1.2.6'
+PACKAGE_STRING='libpipeline 1.2.6'
 PACKAGE_BUGREPORT='cjwatson@debian.org'
 PACKAGE_URL=''
 
@@ -1991,7 +1991,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libpipeline 1.2.5 to adapt to many kinds of systems.
+\`configure' configures libpipeline 1.2.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2061,7 +2061,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libpipeline 1.2.5:";;
+     short | recursive ) echo "Configuration of libpipeline 1.2.6:";;
    esac
   cat <<\_ACEOF
 
@@ -2187,7 +2187,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libpipeline configure 1.2.5
+libpipeline configure 1.2.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2896,7 +2896,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libpipeline $as_me 1.2.5, which was
+It was created by libpipeline $as_me 1.2.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3778,7 +3778,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libpipeline'
- VERSION='1.2.5'
+ VERSION='1.2.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -25970,7 +25970,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libpipeline $as_me 1.2.5, which was
+This file was extended by libpipeline $as_me 1.2.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26036,7 +26036,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libpipeline config.status 1.2.5
+libpipeline config.status 1.2.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 8d73ce2..e56eaa5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure script.
 m4_pattern_forbid([^PIPELINE_])
 
 # Initialise and check we're in the correct directory.
-AC_INIT([libpipeline], [1.2.5], [cjwatson@debian.org])
+AC_INIT([libpipeline], [1.2.6], [cjwatson@debian.org])
 AC_CONFIG_AUX_DIR([tools])
 AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign])
 AM_MAINTAINER_MODE

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4fb4007..6e763e7 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -39,7 +39,7 @@ libpipeline_la_LIBADD = ../gnulib/lib/libgnu.la $(LTLIBOBJS)
 
 libpipeline_la_LDFLAGS = \
        -export-symbols-regex '^(pipecmd|pipeline)_' \
-       -version-info 3:5:2
+       -version-info 3:6:2
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpipeline.pc

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 6244e31..ae82e23 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1060,7 +1060,7 @@ include_HEADERS = pipeline.h
 libpipeline_la_LIBADD = ../gnulib/lib/libgnu.la $(LTLIBOBJS)
 libpipeline_la_LDFLAGS = \
        -export-symbols-regex '^(pipecmd|pipeline)_' \
-       -version-info 3:5:2
+       -version-info 3:6:2
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libpipeline.pc

diff --git a/man/libpipeline.3 b/man/libpipeline.3
index 489c6b7..f9261cf 100644 (file)
--- a/man/libpipeline.3
+++ b/man/libpipeline.3
@@ -536,7 +536,9 @@ exit successfully.
 .Pp
 .It Ft int Fn pipeline_wait "pipeline *p"
 .Pp
-Wait for a pipeline to complete and return the exit status.
+Wait for a pipeline to complete and return its combined exit status,
+calculated as for
+.Fn pipeline_wait_all .
 .Pp
 .It Ft int Fn pipeline_run "pipeline *p"
 .Pp

diff --git a/tests/pump.c b/tests/pump.c
index d9d50ab..61b1f3d 100644 (file)
--- a/tests/pump.c
+++ b/tests/pump.c
@@ -100,6 +100,11 @@ START_TEST (test_pump_tee)
        pipeline_want_outfile (sink_function, function_outfile);
        pipeline_connect (source, sink_process, sink_function, NULL);
        pipeline_pump (source, sink_process, sink_function, NULL);
+       fail_unless (pipeline_wait (source) == 0, "source did not return 0");
+       fail_unless (pipeline_wait (sink_process) == 0,
+                    "process sink did not return 0");
+       fail_unless (pipeline_wait (sink_function) == 0,
+                    "function sink did not return 0");
        fail_unless_files_equal (process_outfile, function_outfile);
 
        free (function_outfile);