From 8546571461215eb65ffcff649c6baa17bc57d605 Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Mon, 10 Apr 2017 17:20:21 -0400
Subject: [PATCH] Ignore clock skew in container libc/package builds using
 make.

It is common for containers to have clock skew so the build process takes care of this issue independently.
---
 doc/xml/release.xml |  4 ++++
 test/test.pl        | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 4d170f557..4999dbef8 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -211,6 +211,10 @@
                     <release-item>
                         <p>Update wording for release note sections.</p>
                     </release-item>
+
+                    <release-item>
+                        <p>Ignore clock skew in container libc/package builds using make.  It is common for containers to have clock skew so the build process takes care of this issue independently.</p>
+                    </release-item>
                 </release-refactor-list>
             </release-doc-list>
 
diff --git a/test/test.pl b/test/test.pl
index 4027fb29a..2f191dc00 100755
--- a/test/test.pl
+++ b/test/test.pl
@@ -457,17 +457,19 @@ eval
                         ($bContainerExists ? "docker exec -i test-build bash -c '" : '') .
                         "cd ${strBuildPath} && perl Makefile.PL INSTALLMAN1DIR=none INSTALLMAN3DIR=none" .
                         ($bContainerExists ? "'" : ''),
-                        {bShowOutputAsync => $bLogDetail});
+                        {bSuppressStdErr => true, bShowOutputAsync => $bLogDetail});
                     executeTest(
                         ($bContainerExists ? 'docker exec -i test-build ' : '') .
                         "make -C ${strBuildPath}",
                         {bSuppressStdErr => true, bShowOutputAsync => $bLogDetail});
                     executeTest(
                         ($bContainerExists ? 'docker exec -i test-build ' : '') .
-                        "make -C ${strBuildPath} test", {bShowOutputAsync => $bLogDetail});
+                        "make -C ${strBuildPath} test",
+                        {bSuppressStdErr => true, bShowOutputAsync => $bLogDetail});
                     executeTest(
                         ($bContainerExists ? 'docker exec -i test-build ' : 'sudo ') .
-                        "make -C ${strBuildPath} install", {bShowOutputAsync => $bLogDetail});
+                        "make -C ${strBuildPath} install",
+                        {bSuppressStdErr => true, bShowOutputAsync => $bLogDetail});
 
                     if ($bContainerExists)
                     {
@@ -476,7 +478,7 @@ eval
 
                     if ($strBuildVM eq $strVmHost)
                     {
-                        executeTest("sudo make -C ${strBuildPath} install");
+                        executeTest("sudo make -C ${strBuildPath} install", {bSuppressStdErr => true});
 
                         # Load the module dynamically
                         require pgBackRest::LibC;