Skip to content
Permalink
Browse files

Fix build.flags being removed on each build.

This was being removed by rsync which forced a full build even when a partial should have been fine.  Rewrite the file after the rsync so it is preserved.
  • Loading branch information...
dwsteele committed May 31, 2019
1 parent 6cba50c commit 388ba0458c37ab4e8b82df0c0fa2b6a4d7462ecb
Showing with 4 additions and 4 deletions.
  1. +4 −4 test/test.pl
@@ -853,11 +853,10 @@ =head1 SYNOPSIS
($bDebugTestTrace ? ' -DDEBUG_TEST_TRACE' : '');
my $strLdFlags = vmWithBackTrace($strBuildVM) && $bNoLint && $bBackTrace ? '-lbacktrace' : '';
my $strConfigOptions = (vmDebugIntegration($strBuildVM) ? ' --enable-test' : '');
my $strBuildFlags = "CFLAGS=${strCFlags}\nLDFLAGS=${strLdFlags}\nCONFIGURE=${strConfigOptions}";
my $strBuildFlagFile = "${strBinPath}/${strBuildVM}/build.flags";

my $bBuildOptionsDiffer = buildPutDiffers(
$oStorageBackRest, "${strBinPath}/${strBuildVM}/build.flags",
"CFLAGS=${strCFlags}\nLDFLAGS=${strLdFlags}\nCONFIGURE=${strConfigOptions}");

my $bBuildOptionsDiffer = buildPutDiffers($oStorageBackRest, $strBuildFlagFile, $strBuildFlags);
$bBuildOptionsDiffer |= grep(/^src\/configure|src\/Makefile.in|src\/build\.auto\.h$/, @stryModifiedList);

# Rebuild if the modification time of the smart file does equal the last changes in source paths
@@ -892,6 +891,7 @@ =head1 SYNOPSIS
"rsync -rt" . (!$bSmart || $bBuildOptionsDiffer ? " --delete-excluded" : '') .
" --include=" . join('/*** --include=', @stryBinSrcPath) . '/*** --exclude=*' .
" ${strBackRestBase}/ ${strBinPath}/${strBuildVM}");
buildPutDiffers($oStorageBackRest, $strBuildFlagFile, $strBuildFlags);

if (vmLintC($strVm) && !$bNoLint)
{

0 comments on commit 388ba04

Please sign in to comment.
You can’t perform that action at this time.