tests: drop the need to set INSTALLED=1 when running tests

Signed-off-by: Marc-André Lureau <[email protected]>

tests/Makefile.am

@@ -233,6 +233,7 @@ install-data-hook:
 	mkdir -p $(DESTDIR)$(testdir)
 	cd $(srcdir) && for file in $(EXTRA_DIST); do install -D "$$file" "$(DESTDIR)$(testdir)/$$file" ; done
 	echo "$(TESTS)" > $(DESTDIR)$(testdir)/tests
+	sed -i '/SWTPM_TEST_UNINSTALLED=1/d' $(DESTDIR)$(testdir)/common
 
 uninstall-hook:
 	cd $(DESTDIR)$(testdir) && rm -f $(EXTRA_DIST) tests

tests/common

@@ -1,7 +1,9 @@
 
 # shellcheck shell=bash
 
-if [ -z "${INSTALLED}" ]; then
+SWTPM_TEST_UNINSTALLED=1
+
+if [ -n "${SWTPM_TEST_UNINSTALLED}" ]; then
     SWTPM=swtpm
     SWTPM_EXE=${SWTPM_EXE:-${ROOT}/src/swtpm/${SWTPM}}
     SWTPM_IOCTL=${SWTPM_IOCTL:-${ROOT}/src/swtpm_ioctl/swtpm_ioctl}

tests/installed-runner.sh

@@ -23,8 +23,6 @@ pass_count=0
 skip_count=0
 fail_count=0
 
-export INSTALLED=1
-
 # Iterate through each test in the TESTS variable
 for t in $TESTS; do
   if [ "$verbose" -eq 1 ]; then