summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xround-robin-bisect.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/round-robin-bisect.sh b/round-robin-bisect.sh
index d97e589..8ec8946 100755
--- a/round-robin-bisect.sh
+++ b/round-robin-bisect.sh
@@ -32,10 +32,23 @@ reproduce_bisect="${reproduce_bisect:-false}"
# Process build args and record them in build-parameters.sh
convert_args_to_variables ^^ $reproduce_bisect %%build_parameters $artifacts/build-parameters "$@"
$reproduce_bisect || manifest_pop
+# Account for "^^ false %%foo bar" options
+SHIFT_CONVERTED_ARGS=$(($SHIFT_CONVERTED_ARGS-4))
+shift "$SHIFT_CONVERTED_ARGS"
obligatory_variables build_parameters rr[ci_project] rr[ci_config]
declare build_parameters
+# Process build args and record them in build-parameters.sh
+convert_args_to_variables ^^ $reproduce_bisect %%baseline_parameters $artifacts/baseline-parameters "$@"
+$reproduce_bisect || manifest_pop
+# Account for "^^ false %%foo bar" options
+SHIFT_CONVERTED_ARGS=$(($SHIFT_CONVERTED_ARGS-4))
+shift "$SHIFT_CONVERTED_ARGS"
+
+obligatory_variables baseline_parameters
+declare baseline_parameters
+
verbose="${verbose-true}"
set -u
@@ -74,6 +87,7 @@ $build_script \
^^ $reproduce_bisect \
%%rr[top_artifacts] "$rel_artifacts/build-baseline" \
@@ $build_parameters/manifest.sh \
+ @@ $baseline_parameters/manifest.sh \
==rr[mode] build \
==rr[update_baseline] force \
--verbose "$verbose" \