aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-11-01 17:12:28 -0700
committerDan Willemsen <dwillemsen@google.com>2016-11-02 13:10:27 -0700
commitb6d88a4f0a6f59017dd84395b2c5b209903d90a3 (patch)
treef22759e4993c3097938c03ee512f92ccbd336301 /tests
parenta2d14b7a408578ff84a788b7ab45e7f6207b110b (diff)
downloadplatform_build_blueprint-b6d88a4f0a6f59017dd84395b2c5b209903d90a3.tar.gz
platform_build_blueprint-b6d88a4f0a6f59017dd84395b2c5b209903d90a3.tar.bz2
platform_build_blueprint-b6d88a4f0a6f59017dd84395b2c5b209903d90a3.zip
Allow build.ninja regeneration (fix Soong globs)
Soong (and soon, Blueprint) embeds the results of filesystem globs into the build.ninja, and uses a helper tool to detect when the glob changes and we need to rebuild the build.ninja file. This is more flexible than listing the affected directories in the depfiles, since it can check to see if a file we actually cared about was added, instead of re-running anytime any file was added/removed (which happens on atomic file modifications as well). My recent bootstrap simplification broke this, since the helper rules are in the main build.ninja, but I removed the ability to regenerate that file from itself. So keep the current model, but add a rule into the primary and main stages that allow themselves to re-run their generator and write out a new build.ninja file if necessary. The actual build rules of the generator aren't necessary, since we already built them in the previous stage. Change-Id: Ib51245920b2ec3ee5306c0c269361a5a8733caa8
Diffstat (limited to 'tests')
-rwxr-xr-xtests/test.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test.sh b/tests/test.sh
index aefff66..6269930 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -17,7 +17,7 @@ if [[ -d .bootstrap/blueprint/test ]]; then
fi
sleep 2
-sed -i 's/${runTests}/-t/' src.build.ninja.in
+sed -i 's/extra =/extra = -t/' src.build.ninja.in
./blueprint.bash
if [[ ! -d .bootstrap/blueprint/test ]]; then