Skip to content

Commit dc4a8ad

Browse files
committed
Migrate "personal" config in tests to new-style XDG config dir
Signing key configuration is obviously something that belongs to the user's macros, but lets get on with the times and use the new XDG config directory for that. The remaining references to ~/.rpmmacros in rpmmacro.at are related to testing behavior with the old-style configuration and need to be preserved. This is the fourth and final step to #3521. Fixes: #3521
1 parent a54e29f commit dc4a8ad

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

tests/mktree.common

+3
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,7 @@ make_install()
2929
# gpg-connect-agent is very, very unhappy if this doesn't exist
3030
mkdir -p $DESTDIR/root/.gnupg
3131
chmod 700 $DESTDIR/root/.gnupg
32+
33+
# set up new-style XDG config directory
34+
mkdir -p $DESTDIR/root/.config/rpm
3235
}

tests/rpmi.at

+1-1
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ for e in 1 2; do
904904
runroot_other cp /build/RPMS/noarch/versiontest-1.0-1.noarch.rpm /tmp/epoch${e}.rpm
905905
done
906906
# for testing sanity
907-
echo '%_query_all_fmt %%{nevra}' >> ${HOME}/.rpmmacros
907+
echo '%_query_all_fmt %%{nevra}' >> ${HOME}/.config/rpm/macros
908908

909909
RPMTEST_CHECK([
910910
RPMDB_INIT

tests/rpmsigdig.at

+3-3
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ AT_SKIP_IF([test x$PGP = xdummy])
13981398
RPMDB_INIT
13991399

14001400
RPMTEST_CHECK([
1401-
cat << EOF >> ${HOME}/.rpmmacros
1401+
cat << EOF >> ${HOME}/.config/rpm/macros
14021402
%_openpgp_sign sq
14031403
%_openpgp_sign_id 771B18D3D7BAA28734333C424344591E1964C5FC
14041404
EOF
@@ -1458,7 +1458,7 @@ AT_SKIP_IF([test x$PGP = xdummy])
14581458
RPMDB_INIT
14591459

14601460
RPMTEST_CHECK([
1461-
cat << EOF >> ${HOME}/.rpmmacros
1461+
cat << EOF >> ${HOME}/.config/rpm/macros
14621462
%_openpgp_sign sq
14631463
%_openpgp_sign_id 771B18D3D7BAA28734333C424344591E1964C5FC
14641464
EOF
@@ -1568,7 +1568,7 @@ AT_SKIP_IF([test x$PGP = xdummy])
15681568
RPMDB_INIT
15691569

15701570
RPMTEST_CHECK([
1571-
cat << EOF >> ${HOME}/.rpmmacros
1571+
cat << EOF >> ${HOME}/.config/rpm/macros
15721572
%_openpgp_sign sq
15731573
%_openpgp_sign_id 771B18D3D7BAA28734333C424344591E1964C5FC
15741574
EOF

0 commit comments

Comments
 (0)