ecmwf · mcakircali · Apr 28, 2026
diff --git a/tests/fdb/tools/compare/all_identical/all_identical.sh.in b/tests/fdb/tools/compare/all_identical/all_identical.sh.in
@@ -4,8 +4,6 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
-
 
 fdbread="$<TARGET_FILE:fdb-read>"
 fdbwrite="$<TARGET_FILE:fdb-write>"

diff --git a/tests/fdb/tools/compare/diff_exp/diff_exp.sh.in b/tests/fdb/tools/compare/diff_exp/diff_exp.sh.in
@@ -4,7 +4,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbread="$<TARGET_FILE:fdb-read>"

diff --git a/tests/fdb/tools/compare/grib_keys_select/grib_keys_select.sh.in b/tests/fdb/tools/compare/grib_keys_select/grib_keys_select.sh.in
@@ -4,7 +4,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbwrite="$<TARGET_FILE:fdb-write>"

diff --git a/tests/fdb/tools/compare/invalid_args/invalid_args.sh.in b/tests/fdb/tools/compare/invalid_args/invalid_args.sh.in
@@ -5,7 +5,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbwrite="$<TARGET_FILE:fdb-write>"

diff --git a/tests/fdb/tools/compare/mars_keys_ignore/mars_keys_ignore.sh.in b/tests/fdb/tools/compare/mars_keys_ignore/mars_keys_ignore.sh.in
@@ -4,7 +4,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbwrite="$<TARGET_FILE:fdb-write>"

diff --git a/tests/fdb/tools/compare/mismatch_grib/mismatch_grib.sh.in b/tests/fdb/tools/compare/mismatch_grib/mismatch_grib.sh.in
@@ -4,7 +4,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbread="$<TARGET_FILE:fdb-read>"
@@ -89,7 +89,7 @@ done
 
 ################
 
-set -e
+set -eux
 $fdbwrite --config=test.yaml scaled.grib
 sync
 

diff --git a/tests/fdb/tools/compare/mismatch_mars/mismatch_mars.sh.in b/tests/fdb/tools/compare/mismatch_mars/mismatch_mars.sh.in
@@ -4,7 +4,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbread="$<TARGET_FILE:fdb-read>"

diff --git a/tests/fdb/tools/compare/option_warnings/option_warnings.sh.in b/tests/fdb/tools/compare/option_warnings/option_warnings.sh.in
@@ -4,7 +4,7 @@ set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 
 fdbwrite="$<TARGET_FILE:fdb-write>"

diff --git a/tests/fdb/tools/dump-toc/fdb_dump-toc.sh.in b/tests/fdb/tools/dump-toc/fdb_dump-toc.sh.in
@@ -1,11 +1,8 @@
 #!/usr/bin/env bash
 
-set -eu
+set -eux
 
-yell() { echo "$(basename "$0"): $*" >&2; }
-die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
-cleanup() { echo "cleanup"; try rm -rf "$@"; }
+cleanup() { echo "cleanup"; rm -rf "$@"; }
 
 export PATH=@CMAKE_BINARY_DIR@/bin:$PATH
 export FDB5_CONFIG_FILE="local.yaml"
@@ -18,12 +15,12 @@ fdbstore="$bindir/$tname/localroot"
 
 ########################################################################################################################
 
-try cd $bindir
+cd $bindir
 
 rm -rf $tname || true
 mkdir -p $tname/localroot
 
-try cd $tname
+cd $tname
 
 for f in local.yaml x.grib; do
   cp "$srcdir/$f" ./
@@ -32,22 +29,22 @@ done
 ########################################################################################################################
 # Create a grib file with 4 steps and populate FDB
 
-try grib_set -s step=0 x.grib 0.grib
-try grib_set -s step=6 x.grib 6.grib
-try grib_set -s step=9 x.grib 9.grib
+grib_set -s step=0 x.grib 0.grib
+grib_set -s step=6 x.grib 6.grib
+grib_set -s step=9 x.grib 9.grib
 
 for f in *.grib; do
-  try grib_set -s type=an "$f" "cf.$f"
+  grib_set -s type=an "$f" "cf.$f"
 done
 
 for f in *.grib; do
-  try cat "$f" >> "$tname.grib"
+  cat "$f" >> "$tname.grib"
 done
 
 ########################################################################################################################
 echo "Running tests on dump-toc for simple toc..."
 
-try fdb-write "$tname.grib"
+fdb-write "$tname.grib"
 
 args="--structure $fdbstore/rd:xxxx:oper:20201102:0000:g/toc"
 out=$(fdb-dump-toc $args)
@@ -62,7 +59,7 @@ TOC_INDEX 2048 1024 toc
 EOF
 )
 
-try test "$exp" = "$parsed"
+test "$exp" = "$parsed"
 
 
 ########################################################################################################################
@@ -73,7 +70,7 @@ cleanup "$fdbstore/*"
 echo "Running tests on dump-toc for tocs with subtoc..."
 
 
-try env FDB5_SUB_TOCS=1 fdb-write "$tname.grib"
+env FDB5_SUB_TOCS=1 fdb-write "$tname.grib"
 
 args="--structure --walk $fdbstore/rd:xxxx:oper:20201102:0000:g/toc"
 out=$(fdb-dump-toc $args)
@@ -108,6 +105,6 @@ TOC_CLEAR 6144 1024 toc
 EOF
 )
 
-try test "$exp" = "$normalised"
+test "$exp" = "$normalised"
 
-cleanup "$fdbstore/*"
+cleanup "$fdbstore/*"
diff --git a/tests/fdb/tools/inspect/fdb_inspect.sh.in b/tests/fdb/tools/inspect/fdb_inspect.sh.in
@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 
-set -eu
-
-yell() { echo "$(basename "$0"): $*" >&2; }
-die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+set -eux
 
 export PATH=@CMAKE_BINARY_DIR@/bin:$PATH
 export FDB5_CONFIG_FILE="local.yaml"
@@ -16,12 +12,12 @@ bindir=@CMAKE_CURRENT_BINARY_DIR@
 
 ########################################################################################################################
 
-try cd $bindir
+cd $bindir
 
 rm -rf $tname || true
 mkdir -p $tname/localroot
 
-try cd $tname
+cd $tname
 
 for f in local.yaml x.grib; do
   cp "$srcdir/$f" ./
@@ -30,19 +26,19 @@ done
 ########################################################################################################################
 # Create a grib file with 4 steps and populate FDB
 
-try grib_set -s step=0 x.grib 0.grib
-try grib_set -s step=6 x.grib 6.grib
-try grib_set -s step=9 x.grib 9.grib
+grib_set -s step=0 x.grib 0.grib
+grib_set -s step=6 x.grib 6.grib
+grib_set -s step=9 x.grib 9.grib
 
 for f in *.grib; do
-  try grib_set -s type=an "$f" "cf.$f"
+  grib_set -s type=an "$f" "cf.$f"
 done
 
 for f in *.grib; do
-  try cat "$f" >> "$tname.grib"
+  cat "$f" >> "$tname.grib"
 done
 
-try fdb-write "$tname.grib"
+fdb-write "$tname.grib"
 
 ########################################################################################################################
 # test all
@@ -61,4 +57,4 @@ out=$(fdb-inspect $requests)
 exp="Number of requests: 8
 Number of elements: 8"
 
-try test "$exp" = "$out"
+test "$exp" = "$out"
diff --git a/tests/fdb/tools/list/list_all.sh.in b/tests/fdb/tools/list/list_all.sh.in
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-set -ux
+set -eux
 
 yell() { printf "$(basename "$0"): \033[0;31m!!! %s !!!\033[0m\\n" "$*" >&2; }
 die() { yell "$*"; exit 1; }
-try() { "$@" || die "Errored HERE => '$*'"; }
+
 
 line_count() {
   [[ $# -eq 1 ]] || die "line_count requires 1 argument; expected line count"
@@ -14,7 +14,7 @@ line_count() {
 
 grep_count() {
   [[ $# -eq 2 ]] || die "grep_count requires 2; regex and expected count"
-  val=$(grep -cE "$1" out)
+  val=$(grep -cE "$1" out || true)
   [[ $val -eq $2 ]] || die "Incorrect count [$val != $2] for regex [$1]"
 }
 
@@ -33,14 +33,14 @@ bin_dir=@CMAKE_CURRENT_BINARY_DIR@
 
 echo "running test '$test_name' on $(hostname)"
 
-try cd $bin_dir
+cd $bin_dir
 
-try rm -rf $test_name
-try mkdir -p $test_name/localroot
+rm -rf $test_name
+mkdir -p $test_name/localroot
 
-try cd $test_name
+cd $test_name
 
-try cp "$src_dir/local.yaml" ./
+cp "$src_dir/local.yaml" ./
 
 work_dir=$(pwd)
 echo "Working directory: $work_dir"
@@ -51,12 +51,12 @@ echo "Working directory: $work_dir"
 
 # Set up the data for the test
 
-try grib_set -s class=rd,expver=xxxx,type=fc,step=0 "$src_data" data.xxxx.0.grib
-try grib_set -s class=rd,expver=xxxx,type=fc,step=1 "$src_data" data.xxxx.1.grib
-try grib_set -s class=rd,expver=xxxx,type=fc,step=2 "$src_data" data.xxxx.2.grib
-try grib_set -s class=rd,expver=xxxy,type=fc,step=0 "$src_data" data.xxxy.0.grib
-try grib_set -s class=rd,expver=xxxy,type=fc,step=1 "$src_data" data.xxxy.1.grib
-try grib_set -s class=rd,expver=xxxy,type=fc,step=2 "$src_data" data.xxxy.2.grib
+grib_set -s class=rd,expver=xxxx,type=fc,step=0 "$src_data" data.xxxx.0.grib
+grib_set -s class=rd,expver=xxxx,type=fc,step=1 "$src_data" data.xxxx.1.grib
+grib_set -s class=rd,expver=xxxx,type=fc,step=2 "$src_data" data.xxxx.2.grib
+grib_set -s class=rd,expver=xxxy,type=fc,step=0 "$src_data" data.xxxy.0.grib
+grib_set -s class=rd,expver=xxxy,type=fc,step=1 "$src_data" data.xxxy.1.grib
+grib_set -s class=rd,expver=xxxy,type=fc,step=2 "$src_data" data.xxxy.2.grib
 
 # Set up some regexes for later testing
 
@@ -75,8 +75,8 @@ for i in 1 2; do
 
   echo "============ Loop $i ============"
 
-  try fdb-write data.xxxx.0.grib
-  try fdb-list --all --minimum-keys="" --porcelain | tee out
+  fdb-write data.xxxx.0.grib
+  fdb-list --all --minimum-keys="" --porcelain | tee out
   if [[ $i = 1 ]]; then
     sum=$((sum + 24))
     line_count $sum
@@ -88,8 +88,8 @@ for i in 1 2; do
   fi
   grep_count "$regex_x0" 24
 
-  try fdb-write data.xxxy.0.grib
-  try fdb-list --all --minimum-keys="" --porcelain | tee out
+  fdb-write data.xxxy.0.grib
+  fdb-list --all --minimum-keys="" --porcelain | tee out
   if [[ $i = 1 ]]; then
     sum=$((sum + 24))
     line_count $sum
@@ -102,8 +102,8 @@ for i in 1 2; do
   grep_count "$regex_y0" 24
 
 
-  try fdb-write data.xxxx.1.grib
-  try fdb-list --all --minimum-keys="" --porcelain | tee out
+  fdb-write data.xxxx.1.grib
+  fdb-list --all --minimum-keys="" --porcelain | tee out
   if [[ $i = 1 ]]; then
     sum=$((sum + 24))
     line_count $sum
@@ -115,8 +115,8 @@ for i in 1 2; do
   grep_count "$regex_y0" 24
   grep_count "$regex_x1" 24
 
-  try fdb-write data.xxxy.1.grib
-  try fdb-list --all --minimum-keys="" --porcelain | tee out
+  fdb-write data.xxxy.1.grib
+  fdb-list --all --minimum-keys="" --porcelain | tee out
   if [[ $i = 1 ]]; then
     sum=$((sum + 24))
     line_count $sum
@@ -129,8 +129,8 @@ for i in 1 2; do
   grep_count "$regex_y1" 24
 
 
-  try fdb-write data.xxxx.2.grib
-  try fdb-list --all --minimum-keys="" --porcelain | tee out
+  fdb-write data.xxxx.2.grib
+  fdb-list --all --minimum-keys="" --porcelain | tee out
   if [[ $i = 1 ]]; then
     sum=$((sum + 24))
     line_count $sum
@@ -142,8 +142,8 @@ for i in 1 2; do
   grep_count "$regex_y1" 24
   grep_count "$regex_x2" 24
 
-  try fdb-write data.xxxy.2.grib
-  try fdb-list --all --minimum-keys="" --porcelain | tee out
+  fdb-write data.xxxy.2.grib
+  fdb-list --all --minimum-keys="" --porcelain | tee out
   [[ $i = 1 ]] && sum=$((sum + 24))
   line_count $sum
   grep_count "$regex_x0" 24
@@ -156,4 +156,4 @@ for i in 1 2; do
 done
 
 echo "cleanup"
-try rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib
+rm -rf "$work_dir/localroot" "$work_dir"/data.*.grib