Test for BLOCKSIZE. Factor the code to simplify it.

tests/envvar-check

@@ -1,53 +1,28 @@
+# -*- sh -*-
 if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
 fi
 
-# FIXME-someday: The following is begging to be factored, ...
-
-$as_unset VERSION_CONTROL SIMPLE_BACKUP_SUFFIX
-$as_unset BLOCK_SIZE DU_BLOCK_SIZE DF_BLOCK_SIZE LS_BLOCK_SIZE
-
-if test "${VERSION_CONTROL+set}" = set; then
-  echo "$0: the VERSION_CONTROL envvar is set --" \
-    ' unset it and rerun this test' >&2
-  envvar_check_fail=1
-fi
-
-if test "${SIMPLE_BACKUP_SUFFIX+set}" = set; then
-  echo "$0: the SIMPLE_BACKUP_SUFFIX envvar is set --" \
-    ' unset it and rerun this test' >&2
-    >&2
-  envvar_check_fail=1
-fi
-
-if test "${BLOCK_SIZE+set}" = set; then
-  echo "$0: the BLOCK_SIZE envvar is set --" \
-    ' unset it and rerun this test' >&2
-    >&2
-  envvar_check_fail=1
-fi
-
-if test "${DU_BLOCK_SIZE+set}" = set; then
-  echo "$0: the DU_BLOCK_SIZE envvar is set --" \
-    ' unset it and rerun this test' >&2
-    >&2
-  envvar_check_fail=1
-fi
-
-if test "${DF_BLOCK_SIZE+set}" = set; then
-  echo "$0: the DF_BLOCK_SIZE envvar is set --" \
-    ' unset it and rerun this test' >&2
-    >&2
-  envvar_check_fail=1
-fi
-
-if test "${LS_BLOCK_SIZE+set}" = set; then
-  echo "$0: the LS_BLOCK_SIZE envvar is set --" \
-    ' unset it and rerun this test' >&2
-    >&2
-  envvar_check_fail=1
-fi
+envvar_check_failed=0
+vars='
+  BLOCKSIZE
+  BLOCK_SIZE
+  DF_BLOCK_SIZE
+  DU_BLOCK_SIZE
+  LS_BLOCK_SIZE
+  SIMPLE_BACKUP_SUFFIX
+  VERSION_CONTROL
+'
+for var in $vars
+do
+  $as_unset $var
+  if eval test \"\${$var+set}\" = set; then
+    echo "$0: the $var environment variable is set --" \
+      ' unset it and rerun this test' >&2
+    envvar_check_failed=1
+  fi
+done
 
 test "$envvar_check_fail" = 1 && exit 1