Skip to content

Update tests to honor REGION_SETS env if provided. #1720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 22, 2025
Merged

Update tests to honor REGION_SETS env if provided. #1720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3adf46
Update tests to honor REGION_SETS env if provided.
leftwo May 22, 2025
163b9bd
PR comments
leftwo May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/test_live_repair.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ if [[ ! -f "$crucible_test" ]] || [[ ! -f "$dsc" ]] || [[ ! -f "$downstairs" ]];
fi

loops=5
region_sets=1
region_sets=${REGION_SETS:-1}

usage () {
echo "Usage: $0 [-l #] [-r #]" >&2
echo " -l loops Number of replacement loops to perform (default 5)" >&2
echo " -r region_sets Number of region sets to create (default 1)" >&2
echo ' -r region_sets Number of region sets to create (default 1, or $REGION_SETS)' >&2
}

while getopts 'l:r:' opt; do
Expand Down
7 changes: 6 additions & 1 deletion tools/test_nightly.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ export BINDIR=${BINDIR:-$ROOT/target/release}
echo "Nightly starts at $(date)" | tee "$output_file"
echo "Running on $(git log -1 --no-color | head -20)" | tee -a "$output_file"
echo "" >> "$output_file"
echo "Environment settings are (Some may be unset):" | tee -a "$output_file"
echo "BINDIR is: $BINDIR" | tee -a "$output_file"
echo "REGION_ROOT is: $REGION_ROOT" | tee -a "$output_file"
echo "WORK_ROOT is: $WORK_ROOT" | tee -a "$output_file"
echo "REGION_SETS is: $REGION_SETS" | tee -a "$output_file"
echo "$(date) hammer start" >> "$output_file"
banner hammer
banner loop
Expand Down Expand Up @@ -93,7 +98,7 @@ sleep 1
banner replace
banner special
echo "$(date) test_replace_special start" >> "$output_file"
./tools/test_replace_special.sh -l 30
./tools/test_replace_special.sh -l 50
res=$?
if [[ "$res" -eq 0 ]]; then
echo "$(date) test_replace_special pass" >> "$output_file"
Expand Down
5 changes: 3 additions & 2 deletions tools/test_replace_special.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ if [[ ! -f "$crucible_test" ]] || [[ ! -f "$dsc" ]] || [[ ! -f "$downstairs" ]];
fi

loops=5
region_sets=1
region_sets=${REGION_SETS:-1}

usage () {
echo "Usage: $0 [-l #] [-r #]" >&2
echo " -l loops Number of test loops to perform (default 5)" >&2
echo " -r region_sets Number of region sets to create (default 1)" >&2
echo ' -r region_sets Number of region sets to create (default 1, or $REGION_SETS)' >&2
}

while getopts 'l:r:' opt; do
Expand Down Expand Up @@ -149,6 +149,7 @@ ${dsc} cmd shutdown
wait "$dsc_pid"

echo "$(date) Test ends with $result" | tee -a "$test_log"
echo "copied log"

if [[ $result -eq 0 ]]; then
# Cleanup
Expand Down
4 changes: 2 additions & 2 deletions tools/test_replay.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ if [[ ! -f "$crucible_test" ]] || [[ ! -f "$dsc" ]] || [[ ! -f "$downstairs" ]];
fi

loops=30
region_sets=1
region_sets=${REGION_SETS:-1}

usage () {
echo "Usage: $0 [-l #]]" >&2
echo " -l loops Number of times to cause a replay." >&2
echo " -r regions Number of region sets to create (default 1)" >&2
echo ' -r regions Number of region sets to create (default 1, or $REGION_SETS)' >&2
}

while getopts 'l:r:' opt; do
Expand Down