script/cibuild,t: always count running tests

In commit c591ff7 of PR git-lfs#3125 the
GIT_LFS_NO_TEST_COUNT environment variable was introduced for use
with our test suites.  When this variable was set to a non-empty
value, it indicated to the setup() and shutdown() test helper
shell functions that they should skip running the lfstest-count-tests
utility program entirely.

This was done because the lfstest-count-tests program had a bug
which prevented it from deleting the lock file, causing subsequent
invocations of the program to be unable to exclusively create it
again.  As this bug was not resolved at the time, the choice was
made to work around the problem in part by not counting the number
of running test scripts on Windows.  (We also introduced the
GIT_LFS_LOCK_ACQUIRE_DISABLED environment variable, in commit
9b73c80 of the same PR, to further
address the problem.)

When running our test suite on Windows, we set the GIT_LFS_NO_TEST_COUNT
to "1", which causes the individual test suites to skip invoking
lfstest-count-tests entirely.  Instead, the program is run just once
in the "test" t/Makefile target before executing the test suites with
the "prove" command, and then once again afterwards, both times by
explicitly resetting the GIT_LFS_NO_TEST_COUNT variable to an empty
string value.  These two invocations cause the lfstest-count-tests
program to start the lfstest-gitserver program before all the test
suites were executed and then stop it once they had all finished.

As we have now resolved the underlying problem in the lfstest-count-tests
utility, in a prior commit in this PR, we can remove this environment
variable and the test suite features it controls.

We change our script/cibuild script to no longer set the
GIT_LFS_NO_TEST_COUNT variable, and we revise the conditionals
in the setup() and shutdown() test helper shell functions so they
always call the lfstest-count-tests program, rather than only doing
so if the GIT_LFS_NO_TEST_COUNT variable is unset or empty.  We
also change the "test" target's recipe in our t/Makefile file to
not unset GIT_LFS_NO_TEST_COUNT when running lfstest-count-tests
before and after it runs the "prove" command.

Finally, as we have already removed the GIT_LFS_LOCK_ACQUIRE_DISABLED
environment variable and all support for it, in a previous commit in
this PR, that allows us now to also eliminate the unset_vars() shell
functions in some of our t/t-*.sh test scripts, which was used to unset
both that variable and the GIT_LFS_NO_TEST_COUNT variable before
running the tests in those scripts.  We added this behaviour in commit
aca1aff of PR git-lfs#3808, when we migrated
our CI test suite to GitHub Actions.  However, we will no longer need
to unset these variables as we will now never set them at all, and they
will have no effect if they were set.

Author: chrisd8088

script/cibuild

@@ -9,7 +9,6 @@ X=""
 if [[ $UNAME == MINGW* || $UNAME == MSYS* || $UNAME == CYGWIN* ]]; then
   X=".exe"
   WINDOWS=1
-  export GIT_LFS_NO_TEST_COUNT=1
 fi
 
 # Build git-lfs-transfer from scutiger.

t/Makefile

@@ -45,9 +45,9 @@ test-commands : $(TEST_CMDS)
 
 test : test-commands
 	$(RM) -r remote test_count{,.lock}
-	@GIT_LFS_NO_TEST_COUNT= bash -c '. ./testenv.sh && setup'
+	@bash -c '. ./testenv.sh && setup'
 	$(PROVE) $(PROVE_EXTRA_ARGS) ./t-*.sh
-	@GIT_LFS_NO_TEST_COUNT= bash -c '. ./testenv.sh && shutdown'
+	@bash -c '. ./testenv.sh && shutdown'
 
 .PHONY : $(TEST_SRCS)
 $(TEST_SRCS) : $(TEST_CMDS)

t/t-env.sh

@@ -6,16 +6,10 @@ envInitConfig='git config filter.lfs.process = "git-lfs filter-process"
 git config filter.lfs.smudge = "git-lfs smudge -- %f"
 git config filter.lfs.clean = "git-lfs clean -- %f"'
 
-unset_vars() {
-    # If set, these will cause the test to fail.
-    unset GIT_LFS_NO_TEST_COUNT
-}
-
 begin_test "env with no remote"
 (
   set -e
   reponame="env-no-remote"
-  unset_vars
   mkdir $reponame
   cd $reponame
   git init
@@ -67,7 +61,6 @@ begin_test "env with origin remote"
 (
   set -e
   reponame="env-origin-remote"
-  unset_vars
   mkdir $reponame
   cd $reponame
   git init
@@ -125,7 +118,6 @@ begin_test "env with multiple remotes"
 (
   set -e
   reponame="env-multiple-remotes"
-  unset_vars
   mkdir $reponame
   cd $reponame
   git init
@@ -186,7 +178,6 @@ begin_test "env with other remote"
 (
   set -e
   reponame="env-other-remote"
-  unset_vars
   mkdir $reponame
   cd $reponame
   git init
@@ -245,7 +236,6 @@ begin_test "env with multiple remotes and lfs.url config"
 (
   set -e
   reponame="env-multiple-remotes-with-lfs-url"
-  unset_vars
   mkdir $reponame
   cd $reponame
   git init
@@ -305,7 +295,6 @@ begin_test "env with multiple remotes and lfs configs"
 (
   set -e
   reponame="env-multiple-remotes-lfs-configs"
-  unset_vars
   mkdir $reponame
   cd $reponame
   git init
@@ -367,7 +356,6 @@ begin_test "env with multiple remotes and batch configs"
 (
   set -e
   reponame="env-multiple-remotes-lfs-batch-configs"
-  unset_vars
   mkdir $reponame
   cd $reponame
   git init
@@ -429,8 +417,6 @@ begin_test "env with .lfsconfig"
 (
   set -e
   reponame="env-with-lfsconfig"
-  unset_vars
-
   git init $reponame
   cd $reponame
 
@@ -499,7 +485,6 @@ begin_test "env with environment variables"
 (
   set -e
   reponame="env-with-envvars"
-  unset_vars
   git init $reponame
   mkdir -p $reponame/a/b/c
 
@@ -677,7 +662,6 @@ begin_test "env with bare repo"
 (
   set -e
   reponame="env-with-bare-repo"
-  unset_vars
   git init --bare $reponame
   cd $reponame
 
@@ -725,7 +709,6 @@ begin_test "env with multiple ssh remotes"
 (
   set -e
   reponame="env-with-ssh"
-  unset_vars
   mkdir $reponame
   cd $reponame
   git init
@@ -877,7 +860,6 @@ begin_test "env with extra transfer methods"
 (
   set -e
   reponame="env-with-transfers"
-  unset_vars
   git init $reponame
   cd $reponame
 
@@ -938,7 +920,6 @@ begin_test "env with multiple remotes and ref"
 (
   set -e
   reponame="env-multiple-remotes-ref"
-  unset_vars
   mkdir $reponame
   cd $reponame
   git init
@@ -1001,7 +982,6 @@ begin_test "env with unicode"
   # This contains a Unicode apostrophe, an E with grave accent, and a Euro sign.
   # Only the middle one is representable in ISO-8859-1.
   reponame="env-d’autre-nom-très-bizarr€"
-  unset_vars
   mkdir $reponame
   cd $reponame
   git init
@@ -1063,7 +1043,6 @@ end_test
 begin_test "env outside a repository"
 (
   set -e
-  unset_vars
 
   # This may or may not work, depending on the system, but it should at least
   # potentially cause Git to print non-English messages.
@@ -1113,7 +1092,6 @@ begin_test "env with duplicate endpoints"
 (
   set -e
   reponame="env-duplicate-endpoints"
-  unset_vars
   mkdir $reponame
   cd $reponame
   git init

t/t-worktree.sh

@@ -7,16 +7,10 @@ envInitConfig='git config filter.lfs.process = "git-lfs filter-process"
 git config filter.lfs.smudge = "git-lfs smudge -- %f"
 git config filter.lfs.clean = "git-lfs clean -- %f"'
 
-unset_vars () {
-    # If set, these will cause the test to fail.
-    unset GIT_LFS_NO_TEST_COUNT
-}
-
 begin_test "git worktree"
 (
     set -e
     reponame="worktree-main"
-    unset_vars
     mkdir $reponame
     cd $reponame
     git init
@@ -99,7 +93,6 @@ begin_test "git worktree with hooks"
 (
     set -e
     reponame="worktree-hooks"
-    unset_vars
     mkdir $reponame
     cd $reponame
     git init

t/testhelpers.sh

@@ -578,17 +578,15 @@ setup() {
   git lfs version | sed -e 's/^/# /g'
   git version | sed -e 's/^/# /g'
 
-  if [ -z "$GIT_LFS_NO_TEST_COUNT" ]; then
-    LFSTEST_URL="$LFS_URL_FILE" \
-    LFSTEST_SSL_URL="$LFS_SSL_URL_FILE" \
-    LFSTEST_CLIENT_CERT_URL="$LFS_CLIENT_CERT_URL_FILE" \
-    LFSTEST_DIR="$REMOTEDIR" \
-    LFSTEST_CERT="$LFS_CERT_FILE" \
-    LFSTEST_CLIENT_CERT="$LFS_CLIENT_CERT_FILE" \
-    LFSTEST_CLIENT_KEY="$LFS_CLIENT_KEY_FILE" \
-    LFSTEST_CLIENT_KEY_ENCRYPTED="$LFS_CLIENT_KEY_FILE_ENCRYPTED" \
-      lfstest-count-tests increment
-  fi
+  LFSTEST_URL="$LFS_URL_FILE" \
+  LFSTEST_SSL_URL="$LFS_SSL_URL_FILE" \
+  LFSTEST_CLIENT_CERT_URL="$LFS_CLIENT_CERT_URL_FILE" \
+  LFSTEST_DIR="$REMOTEDIR" \
+  LFSTEST_CERT="$LFS_CERT_FILE" \
+  LFSTEST_CLIENT_CERT="$LFS_CLIENT_CERT_FILE" \
+  LFSTEST_CLIENT_KEY="$LFS_CLIENT_KEY_FILE" \
+  LFSTEST_CLIENT_KEY_ENCRYPTED="$LFS_CLIENT_KEY_FILE_ENCRYPTED" \
+    lfstest-count-tests increment
 
   wait_for_file "$LFS_URL_FILE"
   wait_for_file "$LFS_SSL_URL_FILE"
@@ -646,11 +644,9 @@ shutdown() {
   # every t/t-*.sh file should cleanup its trashdir
   [ -z "$KEEPTRASH" ] && rm -rf "$TRASHDIR"
 
-  if [ -z "$GIT_LFS_NO_TEST_COUNT" ]; then
-    LFSTEST_DIR="$REMOTEDIR" \
-    LFS_URL_FILE="$LFS_URL_FILE" \
-      lfstest-count-tests decrement
-  fi
+  LFSTEST_DIR="$REMOTEDIR" \
+  LFS_URL_FILE="$LFS_URL_FILE" \
+    lfstest-count-tests decrement
 }
 
 tap_show_plan() {