From b7226907bb6023c40a7ea364f4c1f54d8af91a03 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 15 Nov 2024 12:38:44 +0200
Subject: [PATCH] Move environment setup to RPMTEST_CHECK* directly

No functional changes as such, but one step closer to being able to
drop some of the wrapper functions entirely.
---
 tests/atlocal.in | 5 -----
 tests/local.at   | 3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 11b6550c2c..b244aff319 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -112,7 +112,6 @@ setup_env()
 
 run()
 {
-    setup_env
     "$@" \
          --define "_tmppath ${RPMTEST}/tmp" \
          --define "_db_backend ${DBFORMAT}" \
@@ -121,7 +120,6 @@ run()
 
 rundebug()
 {
-    setup_env
     export RPM_CONFIGDIR=${RPMTEST}/@RPM_CONFIGDIR@
     cp ${RPMDATA}/macros.debug ${RPM_CONFIGDIR}/macros.d/
     run "$@"
@@ -131,13 +129,11 @@ rundebug()
 
 runroot()
 {
-    setup_env
     snapshot exec "$@"
 }
 
 runroot_other()
 {
-    setup_env
     snapshot exec "$@"
 }
 
@@ -149,7 +145,6 @@ runroot_user()
             shift 2
         ;;
     esac
-    setup_env
     runroot_other --new-session sudo -iu $RPMUSER "$@"
 }
 
diff --git a/tests/local.at b/tests/local.at
index 153bcfc4ce..7408717a2d 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -30,10 +30,12 @@ LD_PRELOAD=${ASANLIB} ASAN_OPTIONS=detect_leaks=0 ${PYTHON} test.py
 ]])
 
 m4_define([RPMTEST_CHECK],[
+setup_env
 AT_CHECK($@)
 ])
 
 m4_define([RPMTEST_CHECK_UNQUOTED],[
+setup_env
 AT_CHECK_UNQUOTED($@)
 ])
 
@@ -61,6 +63,7 @@ RPMTEST_CHECK([RPMPY_RUN([$1])], [], [$2], [$3])
 m4_define([RPMPY_TEST],[
 AT_SETUP([$1])
 AT_KEYWORDS([python])
+setup_env
 RPMDB_INIT
 RPMPY_CHECK([$2], [$3], [$4])
 RPMTEST_CLEANUP