Fix mistakes in commit d45099425eb19e420433c9d81d354fe585f4dbd6.

I intended to include a change to the "skip" count in the test
case, but it didn't get folded into the commit. Do that now,
so that non-zlib builds don't break.

The new file bbstreamer_gzip.c needs <unistd.h> to avoid
complaints about dup() not having a prototype, as per buildfarm
returns.

diff --git a/src/bin/pg_basebackup/bbstreamer_gzip.c b/src/bin/pg_basebackup/bbstreamer_gzip.c
index 2c16e62882547cf85ec7aa0e61b012a27786ac0c..894f8571038c5389b5f750cffea5a77e0ef3a874 100644 (file)
--- a/src/bin/pg_basebackup/bbstreamer_gzip.c
+++ b/src/bin/pg_basebackup/bbstreamer_gzip.c
@@ -11,6 +11,8 @@
 
 #include "postgres_fe.h"
 
+#include <unistd.h>
+
 #ifdef HAVE_LIBZ
 #include <zlib.h>
 #endif

diff --git a/src/bin/pg_verifybackup/t/009_extract.pl b/src/bin/pg_verifybackup/t/009_extract.pl
index f1091ffea7a4fe840efe44a15f7856bf2ef798d9..51b77e4bfe64f82e00a806ff9417ff5b9c9d185a 100644 (file)
--- a/src/bin/pg_verifybackup/t/009_extract.pl
+++ b/src/bin/pg_verifybackup/t/009_extract.pl
@@ -36,7 +36,7 @@ for my $tc (@test_configuration)
    my $method = $tc->{'compression_method'};
 
    SKIP: {
-       skip "$method compression not supported by this build", 3
+       skip "$method compression not supported by this build", 2
            if ! $tc->{'enabled'};
 
        # Take backup with server compression enabled.