Move test-suite build config out of root's ~/.rpmmacros

The second step to fixing rpm-software-management#3521
pmatilai · Jan 16, 2025 · f76c086 · f76c086
1 parent 39578b4
commit f76c086
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/data/macros.testenv b/tests/data/macros.testenv
@@ -1,4 +1,4 @@
-# root's macro config in the test-environment
+# common macro config in the test-environment
 %_buildhost testhost
 %_topdir %{getenv:RPMTEST}/build
 %_tmppath %{getenv:RPMTEST}/tmp
diff --git a/tests/mktree.common b/tests/mktree.common
@@ -24,8 +24,8 @@ make_install()
     mkdir -p $DESTDIR/build
     ln -sf ../data/SOURCES $DESTDIR/build/
 
-    # append in case Dockerfile put something in there already
-    cat @CMAKE_CURRENT_SOURCE_DIR@/data/macros.testenv >> $DESTDIR/root/.rpmmacros
+    # system-wide config to match our test environment
+    cp @CMAKE_CURRENT_SOURCE_DIR@/data/macros.testenv $DESTDIR/@CMAKE_INSTALL_FULL_SYSCONFDIR@/rpm/
     # gpg-connect-agent is very, very unhappy if this doesn't exist
     mkdir -p $DESTDIR/root/.gnupg
     chmod 700 $DESTDIR/root/.gnupg