Maybe final polishing

Author: leftwo

tools/hammer_loop.sh

@@ -13,9 +13,9 @@ ROOT=$(cd "$(dirname "$0")/.." && pwd)
 cd "$ROOT" || (echo failed to cd "$ROOT"; exit 1)
 
 export BINDIR=${BINDIR:-$ROOT/target/debug}
-hammer="$BINDIR/crucible-hammer"
-cds="$BINDIR/crucible-downstairs"
-dsc="$BINDIR/dsc"
+hammer="${BINDIR}/crucible-hammer"
+cds="${BINDIR}/crucible-downstairs"
+dsc="${BINDIR}/dsc"
 for bin in $hammer $cds $dsc; do
     if [[ ! -f "$bin" ]]; then
         echo "Can't find crucible binary at $bin" >&2
@@ -30,7 +30,7 @@ if pgrep -fl -U "$(id -u)" "$cds"; then
 fi
 
 WORK_ROOT=${WORK_ROOT:-/tmp}
-TEST_ROOT="$WORK_ROOT/hammer_loop"
+TEST_ROOT="${WORK_ROOT}/hammer_loop"
 if [[ -d "$TEST_ROOT" ]]; then
     # Delete previous test data
     rm -r "$TEST_ROOT"
@@ -52,9 +52,9 @@ if [[ $? -ne 0 ]]; then
     exit 1
 fi
 
-loop_log="$TEST_ROOT/hammer_loop.log"
-test_log="$TEST_ROOT/hammer_loop_test.log"
-dsc_ds_log="$TEST_ROOT/hammer_loop_dsc.log"
+loop_log="${TEST_ROOT}/hammer_loop.log"
+test_log="${TEST_ROOT}/hammer_loop_test.log"
+dsc_ds_log="${TEST_ROOT}/hammer_loop_dsc.log"
 
 loops=20
 

tools/test_live_repair.sh

@@ -45,17 +45,17 @@ if [[ $? -ne 0 ]]; then
     exit 1
 fi
 
-loop_log="$TEST_ROOT"/test_live_repair_summary.log
-test_log="$TEST_ROOT"/test_live_repair.log
-verify_log="$TEST_ROOT/test_live_repair_verify.log"
-dsc_ds_log="$TEST_ROOT/test_live_repair_dsc.log"
+loop_log="${TEST_ROOT}/test_live_repair_summary.log"
+test_log="${TEST_ROOT}/test_live_repair.log"
+verify_log="${TEST_ROOT}/test_live_repair_verify.log"
+dsc_ds_log="${TEST_ROOT}/test_live_repair_dsc.log"
 
 ROOT=$(cd "$(dirname "$0")/.." && pwd)
 cd "$ROOT" || (echo failed to cd "$ROOT"; exit 1)
 export BINDIR=${BINDIR:-$ROOT/target/debug}
-crucible_test="$BINDIR/crutest"
-dsc="$BINDIR/dsc"
-downstairs="$BINDIR/crucible-downstairs"
+crucible_test="${BINDIR}/crutest"
+dsc="${BINDIR}/dsc"
+downstairs="${BINDIR}/crucible-downstairs"
 if [[ ! -f "$crucible_test" ]] || [[ ! -f "$dsc" ]] || [[ ! -f "$downstairs" ]]; then
     echo "Can't find required binaries"
     echo "Missing $crucible_test or $dsc or $downstairs"

tools/test_repair.sh

@@ -28,9 +28,9 @@ ROOT=$(cd "$(dirname "$0")/.." && pwd)
 cd "$ROOT" || (echo failed to cd "$ROOT"; exit 1)
 export BINDIR=${BINDIR:-$ROOT/target/debug}
 
-cds="$BINDIR/crucible-downstairs"
-ct="$BINDIR/crutest"
-dsc="$BINDIR/dsc"
+cds="${BINDIR}/crucible-downstairs"
+ct="${BINDIR}/crutest"
+dsc="${BINDIR}/dsc"
 
 for bin in $cds $ct $dsc; do
     if [[ ! -f "$bin" ]]; then
@@ -65,10 +65,10 @@ if [[ $? -ne 0 ]]; then
     exit 1
 fi
 
-verify_file="$TEST_ROOT/test_repair_verify.data"
-test_log="$TEST_ROOT/test_repair_out.txt"
-ds_log_prefix="$TEST_ROOT/test_repair_ds"
-dsc_output_dir="$TEST_ROOT/test_repair_dsc"
+verify_file="${TEST_ROOT}/test_repair_verify.data"
+test_log="${TEST_ROOT}/test_repair_out.txt"
+ds_log_prefix="${TEST_ROOT}/test_repair_ds"
+dsc_output_dir="${TEST_ROOT}/test_repair_dsc"
 loops=100
 
 usage () {

tools/test_replace_special.sh

@@ -41,17 +41,17 @@ if [[ $? -ne 0 ]]; then
     exit 1
 fi
 
-loop_log="$TEST_ROOT/test_replace_special_summary.log"
-test_log="$TEST_ROOT/test_replace_special.log"
-verify_log="$TEST_ROOT/test_replace_special_verify.log"
-dsc_ds_log="$TEST_ROOT/test_replace_special_dsc.log"
+loop_log="${TEST_ROOT}/test_replace_special_summary.log"
+test_log="${TEST_ROOT}/test_replace_special.log"
+verify_log="${TEST_ROOT}/test_replace_special_verify.log"
+dsc_ds_log="${TEST_ROOT}/test_replace_special_dsc.log"
 
 ROOT=$(cd "$(dirname "$0")/.." && pwd)
 cd "$ROOT" || (echo failed to cd "$ROOT"; exit 1)
 export BINDIR=${BINDIR:-$ROOT/target/debug}
-crucible_test="$BINDIR/crutest"
-dsc="$BINDIR/dsc"
-downstairs="$BINDIR/crucible-downstairs"
+crucible_test="${BINDIR}/crutest"
+dsc="${BINDIR}/dsc"
+downstairs="${BINDIR}/crucible-downstairs"
 if [[ ! -f "$crucible_test" ]] || [[ ! -f "$dsc" ]] || [[ ! -f "$downstairs" ]]; then
     echo "Can't find required binaries"
     echo "Missing $crucible_test or $dsc or $downstairs"

tools/test_replay.sh

@@ -38,16 +38,16 @@ if [[ $? -ne 0 ]]; then
     exit 1
 fi
 
-test_log="$TEST_ROOT/test_replay.log"
-verify_log="$TEST_ROOT/test_replay_verify.log"
-dsc_ds_log="$TEST_ROOT/test_replay_dsc.log"
+test_log="${TEST_ROOT}/test_replay.log"
+verify_log="${TEST_ROOT}/test_replay_verify.log"
+dsc_ds_log="${TEST_ROOT}/test_replay_dsc.log"
 
 ROOT=$(cd "$(dirname "$0")/.." && pwd)
 cd "$ROOT" || (echo failed to cd "$ROOT"; exit 1)
 export BINDIR=${BINDIR:-$ROOT/target/debug}
-crucible_test="$BINDIR/crutest"
-dsc="$BINDIR/dsc"
-downstairs="$BINDIR/crucible-downstairs"
+crucible_test="${BINDIR}/crutest"
+dsc="${BINDIR}/dsc"
+downstairs="${BINDIR}/crucible-downstairs"
 if [[ ! -f "$crucible_test" ]] || [[ ! -f "$dsc" ]] || [[ ! -f "$downstairs" ]]; then
     echo "Can't find required binaries"
     echo "Missing $crucible_test or $dsc or $downstairs"

tools/test_restart_repair.sh

@@ -63,9 +63,9 @@ ROOT=$(cd "$(dirname "$0")/.." && pwd)
 cd "$ROOT" || (echo failed to cd "$ROOT"; exit 1)
 export BINDIR=${BINDIR:-$ROOT/target/debug}
 
-cds="$BINDIR/crucible-downstairs"
-ct="$BINDIR/crutest"
-dsc="$BINDIR/dsc"
+cds="${BINDIR}/crucible-downstairs"
+ct="${BINDIR}/crutest"
+dsc="${BINDIR}/dsc"
 for bin in $cds $ct $dsc; do
     if [[ ! -f "$bin" ]]; then
         echo "Can't find crucible binary at $bin" >&2
@@ -120,11 +120,11 @@ if [[ $? -ne 0 ]]; then
     exit 1
 fi
 
-export loop_log="$TEST_ROOT/test_restart_repair.log"
-export test_log="$TEST_ROOT/test_restart_repair_test.log"
-export verify_log="$TEST_ROOT/test_restart_repair_verify.log"
-export dsc_log="$TEST_ROOT/test_restart_repair_dsc.log"
-export dsc_ds_log="$TEST_ROOT/dsc"
+export loop_log="${TEST_ROOT}/test_restart_repair.log"
+export test_log="${TEST_ROOT}/test_restart_repair_test.log"
+export verify_log="${TEST_ROOT}/test_restart_repair_verify.log"
+export dsc_log="${TEST_ROOT}/test_restart_repair_dsc.log"
+export dsc_ds_log="${TEST_ROOT}/dsc"
 
 touch "$loop_log"
 echo "starting $(date)" | tee "$loop_log"