diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-01-19 14:48:35 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-01-22 13:37:58 +0000 |
| commit | dd49fbf78ef3dde178adff63cfaee8b5d824da48 (patch) | |
| tree | c4c8747c5e610fcb4f2977b05b97b6cc01f1ef70 | |
| parent | 06f786a9afed7c5947b9c3fba94b83588233dcd6 (diff) | |
tcwg_kernel-bisect.sh: Fix manifest handling in reproducer runs
1. Move build-parameters.sh to manifests/, so it survives artifacts
cleaning.
2. Don't overwrite build-parameters.sh in reproducer runs --
use "^^ $reproduce_bisect" when generating it (see documentation
of convert_args_to_variables).
3. Finally, don't pop the manifest filename when reproducing
(since the manifest filename is not pushed when "^^ true").
Change-Id: I2c2cfc571dfc11fcee7b9720d6d30bc5ee9d6897
| -rwxr-xr-x | tcwg_kernel-bisect.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tcwg_kernel-bisect.sh b/tcwg_kernel-bisect.sh index 921699f5..8050e596 100755 --- a/tcwg_kernel-bisect.sh +++ b/tcwg_kernel-bisect.sh @@ -19,8 +19,8 @@ BUILD_URL="${BUILD_URL:-$(pwd)}" reproduce_bisect="${reproduce_bisect:-false}" # Process build args and record them in build-parameters.sh -convert_args_to_variables %% $artifacts/build-parameters.sh "$@" -manifest_pop +convert_args_to_variables ^^ $reproduce_bisect %% $artifacts/manifests/build-parameters.sh "$@" +$reproduce_bisect || manifest_pop obligatory_variables current_project toolchain @@ -47,7 +47,7 @@ echo "Testing baseline_rev $baseline_rev (should be success)" $scripts/tcwg_kernel-build.sh \ ^^ $reproduce_bisect \ %% $artifacts/manifests/build-baseline.sh \ - @@ $artifacts/build-parameters.sh \ + @@ $artifacts/manifests/build-parameters.sh \ --mode "baseline" \ --current_rev "$baseline_rev" \ --reset_baseline true \ @@ -101,7 +101,7 @@ cd .. $scripts/tcwg_kernel-build.sh \ ^^ $reproduce_bisect \ %% $artifacts/manifests/build-\$rev.sh \ - @@ $artifacts/build-parameters.sh \ + @@ $artifacts/manifests/build-parameters.sh \ --mode bisect \ --top_artifacts $artifacts/build-\$rev \ --verbose "$verbose" & |