From 455c6048ee4794a2d334067e4651460b3ad2b416 Mon Sep 17 00:00:00 2001 From: David Steele Date: Mon, 30 Jan 2017 14:00:40 -0500 Subject: [PATCH] C Library builds immune to clock differences between VM and host. --- test/test.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/test.pl b/test/test.pl index 46221e1b2..18fac9b1b 100755 --- a/test/test.pl +++ b/test/test.pl @@ -311,9 +311,7 @@ eval executeTest("sudo rm -rf ${strBuildBasePath}"); filePathCreate($strBuildPath, undef, true, true); - executeTest("cp -rp ${strLibCPath}/* ${strBuildPath}"); - utime($lTimestampLast, $lTimestampLast, $strMakeFile) or - confess "unable to set time for ${strMakeFile}" . (defined($!) ? ":$!" : ''); + executeTest("cp -r ${strLibCPath}/* ${strBuildPath}"); executeTest( "cd ${strBuildPath} && perl Makefile.PL INSTALLMAN1DIR=none INSTALLMAN3DIR=none", @@ -341,6 +339,9 @@ eval { confess &log(ERROR, $strLibCVersion . ' was expected for LibC version but found ' . libCVersion()); } + + utime($lTimestampLast, $lTimestampLast, $strMakeFile) or + confess "unable to set time for ${strMakeFile}" . (defined($!) ? ":$!" : ''); } # Exit if only testing the C library @@ -403,7 +404,7 @@ eval &log(INFO, "Build/test C library for ${strBuildVM} (${strBuildPath})"); filePathCreate($strBuildPath, undef, true, true); - executeTest("cp -rp ${strBackRestBase}/libc/* ${strBuildPath}"); + executeTest("cp -r ${strBackRestBase}/libc/* ${strBuildPath}"); executeTest( "docker exec -i test-build " .