changed shell ${x?missing} to ${x:?missing}

NormalSubgroup · Nov 6, 2024 · 3af7c6d · 3af7c6d
1 parent 112550c
commit 3af7c6d
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 44 deletions.
diff --git a/gf2x/ci/utilities/coverage-postprocess.sh b/gf2x/ci/utilities/coverage-postprocess.sh
@@ -17,7 +17,7 @@ while [ $# -gt 1 ] ; do
     fi
 done
 
-: ${OUTPUTDIR?missing}
+: ${OUTPUTDIR:?missing}
 
 rev=
 

diff --git a/scripts/estimate_matsize/estimate_matsize.sh b/scripts/estimate_matsize/estimate_matsize.sh
@@ -54,8 +54,8 @@ set -e
 : ${seed=0}
 
 # These are normally set by cmake during tests
-if ! [ -d ${CADO_NFS_BINARY_DIR?missing} ] ; then echo "$CADO_NFS_BINARY_DIR missing" >&2 ; exit 1 ; fi
-if ! [ -d ${CADO_NFS_SOURCE_DIR?missing} ] ; then echo "$CADO_NFS_SOURCE_DIR missing" >&2 ; exit 1 ; fi
+if ! [ -d ${CADO_NFS_BINARY_DIR:?missing} ] ; then echo "$CADO_NFS_BINARY_DIR missing" >&2 ; exit 1 ; fi
+if ! [ -d ${CADO_NFS_SOURCE_DIR:?missing} ] ; then echo "$CADO_NFS_SOURCE_DIR missing" >&2 ; exit 1 ; fi
 
 
 ## The following can also be overriden with env variables

diff --git a/tests/estimate_matsize/test_with_relation_cache.sh b/tests/estimate_matsize/test_with_relation_cache.sh
@@ -14,7 +14,7 @@ params_args=(
     slaves.hostnames=localhost
     tasks.sieve.las.threads=auto
     tasks.polyselect.import="$CADO_NFS_SOURCE_DIR/tests/estimate_matsize/p80.poly"
-    tasks.workdir=${wdir?missing}
+    tasks.workdir=${wdir:?missing}
 )
 
 paramfile_args=(

diff --git a/tests/filter/test_dup2.sh b/tests/filter/test_dup2.sh
@@ -5,7 +5,7 @@
 
 set -e
 
-: ${WORKDIR?missing}
+: ${WORKDIR:?missing}
 
 DL=()
 
@@ -46,10 +46,10 @@ while [ $# -gt 0 ] ; do
     fi
 done
 
-: ${CADO_NFS_BINARY_DIR?missing}
-: ${POLY?missing}
-: ${LPBS?missing}
-: ${RELS?missing}
+: ${CADO_NFS_BINARY_DIR:?missing}
+: ${POLY:?missing}
+: ${LPBS:?missing}
+: ${RELS:?missing}
 
 RENUMBER="${WORKDIR}/renumber.gz"
 WORK_RELS="${WORKDIR}/rels.gz"

diff --git a/tests/filter/test_filter_galois.sh b/tests/filter/test_filter_galois.sh
@@ -26,7 +26,7 @@ done
 FG="$build_tree/filter/filter_galois"
 SOURCE_TEST_DIR="`dirname "$0"`"
 
-: ${wdir?missing}
+: ${wdir:?missing}
 
 poly="${SOURCE_TEST_DIR}/test_filter_galois.d20.poly"
 renumber="${SOURCE_TEST_DIR}/test_filter_galois.d20.renumber"

diff --git a/tests/filter/testsm.sh b/tests/filter/testsm.sh
@@ -20,7 +20,7 @@ done
 SM="$build_tree/filter/sm"
 SOURCE_TEST_DIR="`dirname "$0"`"
 
-: ${wdir?missing}
+: ${wdir:?missing}
 
 poly="${SOURCE_TEST_DIR}/testsm.p59.poly"
 purged="${SOURCE_TEST_DIR}/testsm.p59.purged.gz"

diff --git a/tests/guess_mpi_configs.sh b/tests/guess_mpi_configs.sh
@@ -19,7 +19,7 @@
 #       ditto for exporter_mpi_extra_args and mpi_extra_args
 
 : ${bindir:=$PROJECT_BINARY_DIR}
-: ${bindir?missing variable}
+: ${bindir:?missing variable}
 
 # not sure that it makes sense to have this script distinct from bwc.pl
 

diff --git a/tests/linalg/bwc/bwc-dispatch-matmul.sh b/tests/linalg/bwc/bwc-dispatch-matmul.sh
@@ -7,7 +7,7 @@ if [ "$CADO_DEBUG" ] ; then set -x ; fi
 # only arguments understood are mpi= thr= seed=
 
 : ${bindir:=$PROJECT_BINARY_DIR}
-: ${bindir?missing variable}
+: ${bindir:?missing variable}
 
 # inject the variables that were provided by guess_mpi_configs
 if [ "$mpi" ] ; then
@@ -53,7 +53,7 @@ while [ $# -gt 0 ] ; do
     fi
 done
 
-: ${bindir?missing variable}
+: ${bindir:?missing variable}
 
 if ! [ -d "$bindir" ] ; then
     echo "bindir $bindir does not exist" >&2

diff --git a/tests/linalg/bwc/test-blocklanczos.sh b/tests/linalg/bwc/test-blocklanczos.sh
@@ -60,7 +60,7 @@ while [ $# -gt 0 ] ; do
     fi
 done
 
-: "${CADO_NFS_BINARY_DIR?missing}"
+: "${CADO_NFS_BINARY_DIR:?missing}"
 
 redirect_unless_debug() {
     file="$1"

diff --git a/tests/linalg/bwc/test-plingen.sh b/tests/linalg/bwc/test-plingen.sh
@@ -7,7 +7,7 @@ set -e
 if [ "$CADO_DEBUG" ] ; then set -x ; fi
 
 : ${bindir:=$PROJECT_BINARY_DIR}
-: ${bindir?missing variable}
+: ${bindir:?missing variable}
 : ${wdir:?missing}
 
 # inject the variables that were provided by guess_mpi_configs

diff --git a/tests/linalg/bwc/test_matrix_file.sh b/tests/linalg/bwc/test_matrix_file.sh
@@ -4,9 +4,9 @@ set -e
 
 if [ "$CADO_DEBUG" ] ; then set -x ; fi
 
-: ${wdir?missing}
-: ${CADO_NFS_BINARY_DIR?missing}
-: ${CADO_NFS_SOURCE_DIR?missing}
+: ${wdir:?missing}
+: ${CADO_NFS_BINARY_DIR:?missing}
+: ${CADO_NFS_SOURCE_DIR:?missing}
 : ${test_id:=$1}
 : ${test_id:=sample1}
 

diff --git a/tests/misc/test_renumber.sh b/tests/misc/test_renumber.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-: ${wdir?missing}
+: ${wdir:?missing}
 
 while [ $# -gt 0 ] ; do
     if [ "$1" = "-b" ] ; then
@@ -23,9 +23,9 @@ while [ $# -gt 0 ] ; do
     fi
 done
 
-: ${BUILD_DIR?missing}
-: ${POLY?missing}
-: ${LPBS?missing}
+: ${BUILD_DIR:?missing}
+: ${POLY:?missing}
+: ${LPBS:?missing}
 
 RENUMBER="${wdir}/renumber.gz"
 

diff --git a/tests/pipe_to_sage.sh b/tests/pipe_to_sage.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
 set -e
-: ${wdir?missing}
+: ${wdir:?missing}
 "$@" > "$wdir/test.sage"
 "$SAGE" "$wdir/test.sage"
diff --git a/tests/sieve/F9.dupsup.sh b/tests/sieve/F9.dupsup.sh
@@ -5,7 +5,7 @@ if [ "$CADO_DEBUG" ] ; then
 fi
 set -e
 
-WORKDIR=${wdir?missing}
+WORKDIR=${wdir:?missing}
 
 RELSD="${WORKDIR:?missing}/rels_dupsup"
 RELSR="${WORKDIR:?missing}/rels_raw"

diff --git a/tests/sieve/c60.fakerels.sh b/tests/sieve/c60.fakerels.sh
@@ -2,8 +2,8 @@
 
 # See https://sympa.inria.fr/sympa/arc/cado-nfs/2020-09/msg00020.html
 
-: ${CADO_NFS_BINARY_DIR?missing}
-: ${CADO_NFS_SOURCE_DIR?missing}
+: ${CADO_NFS_BINARY_DIR:?missing}
+: ${CADO_NFS_SOURCE_DIR:?missing}
 
 FREEREL=${CADO_NFS_BINARY_DIR}/sieve/freerel
 FAKERELS=${CADO_NFS_BINARY_DIR}/sieve/fake_rels

diff --git a/tests/sieve/strategies/test_main_script.sh b/tests/sieve/strategies/test_main_script.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-: ${CADO_NFS_SOURCE_DIR?missing}
-: ${CADO_NFS_BINARY_DIR?missing}
+: ${CADO_NFS_SOURCE_DIR:?missing}
+: ${CADO_NFS_BINARY_DIR:?missing}
 
 t=`mktemp -d ${TMPDIR-/tmp}/cado-nfs.XXXXXXXXX`
 cd $t

diff --git a/tests/sqrt/test_crtalgsqrt.sh b/tests/sqrt/test_crtalgsqrt.sh
@@ -4,7 +4,7 @@ DEP=$1
 RATDEP=$2
 POLY=$3
 
-: ${CADO_NFS_BINARY_DIR?missing}
+: ${CADO_NFS_BINARY_DIR:?missing}
 
 set -- $DEP $RATDEP $POLY
 # inject the variables that were provided by guess_mpi_configs

diff --git a/tests/utils/numbertheory/test-badideals.sh b/tests/utils/numbertheory/test-badideals.sh
@@ -28,7 +28,7 @@ while [ $# -gt 0 ] ; do
     fi
 done
 
-: ${CADO_NFS_BINARY_DIR?missing}
+: ${CADO_NFS_BINARY_DIR:?missing}
 
 if ! [ "$CADO_NFS_BINARY_DIR/utils/numbertheory_tool" ] ; then
     usage

diff --git a/tests/utils/test_explain_relations_with_sagemath.sh b/tests/utils/test_explain_relations_with_sagemath.sh
@@ -24,19 +24,19 @@ while [ $# -gt 0 ] ; do
     fi
 done
 
-: ${SAGE?missing}
-: ${build_tree?missing}
-: ${wdir?missing}
-: ${POLY?missing}
-: ${LIM0?missing}
-: ${LIM1?missing}
-: ${LPB0?missing}
-: ${LPB1?missing}
-: ${MFB0?missing}
-: ${MFB1?missing}
-: ${Q0?missing}
-: ${Q1?missing}
-: ${I?missing}
+: ${SAGE:?missing}
+: ${build_tree:?missing}
+: ${wdir:?missing}
+: ${POLY:?missing}
+: ${LIM0:?missing}
+: ${LIM1:?missing}
+: ${LPB0:?missing}
+: ${LPB1:?missing}
+: ${MFB0:?missing}
+: ${MFB1:?missing}
+: ${Q0:?missing}
+: ${Q1:?missing}
+: ${I:?missing}
 
 name=$(basename $POLY .poly)
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ while [ $# -gt 1 ] ; do @@
         fi
     done
-    : ${OUTPUTDIR?missing}
+    : ${OUTPUTDIR:?missing}
     rev=
@@ Expand Down @@