tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use combined.ninja for soong_docs null build test.

Browse source 
This requires some explanation: turns out, Ninja uses the $builddir
variable declared in the top-level Ninja file to figure out where the
command log should go. This resulted in a loss of incrementality between
the manual Ninja invocation in test_null_build_after_docs because they
used different Ninja files and therefore different values of $builddir.

The reason why this was not a problem before is that the output files of
the main Ninja file and the bootstrap one were separate, but with that
changing, this will start to matter.

Test: Presubmits.
Change-Id: I28959cc7d659e698c7694a58326c8731eac060eb
This commit is contained in:
Lukacs T. Berki 2021-08-19 16:24:30 +02:00
parent abcce6f1c3
commit 1a86bd2dc4
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/bootstrap_test.sh
View file

@ -477,7 +477,8 @@ function test_null_build_after_docs {
run_soong
local mtime1=$(stat -c "%y" out/soong/build.ninja)
prebuilts/build-tools/linux-x86/bin/ninja -f out/soong/build.ninja soong_docs
prebuilts/build-tools/linux-x86/bin/ninja -f out/combined.ninja soong_docs
run_soong
local mtime2=$(stat -c "%y" out/soong/build.ninja)