fixup! Run all signing tests with runroot since we now can

Let's make it easier to add/remove --setenv lines from the snapshot()
command by shuffling around the lines a bit, and also replace one
forgotten use of $NEW.

tests/atlocal.in

@@ -82,9 +82,9 @@ snapshot()
         exec)
             bwrap --unshare-pid --dev-bind $RPMTEST / --clearenv \
                   --setenv PATH $(env -i sh -c 'echo $PATH') \
-                  --setenv HOME /root --chdir / --dev /dev --proc /proc \
-		  --setenv GPG_TTY "" \
-                  --die-with-parent "$@"
+                  --setenv HOME /root \
+                  --setenv GPG_TTY "" \
+                  --chdir / --dev /dev --proc /proc --die-with-parent "$@"
         ;;
         shell)
             local source=$(findmnt -no SOURCE --mountpoint $RPMTEST)

tests/rpmsigdig.at

@@ -1196,7 +1196,7 @@ ORIG="/data/RPMS/hello-2.0-1.x86_64.rpm"
 NEW="/tmp/hello-2.0-1.x86_64.rpm"
 
 runroot_other cp ${ORIG} /tmp/
-runroot rpmsign --key-id 4344591E1964C5FC --addsign /tmp/hello-2.0-1.x86_64.rpm
+runroot rpmsign --key-id 4344591E1964C5FC --addsign ${NEW}
 runroot_other cmp -s ${ORIG} ${NEW}; echo $?
 runroot rpmsign --delsign ${NEW}
 runroot_other cmp -s ${ORIG} ${NEW}; echo $?