From 970a20974bdb1a4d56c619bbe858d4c2eca7dccd Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 4 Jul 2017 10:04:07 -0700 Subject: [PATCH] build_rpm: print out nevra rather than just name It's more precise and makes it possible to find out if e.g. pkg upgrades made it to the tree. Closes: #859 Approved by: cgwalters --- tests/common/libtest.sh | 2 +- tests/vmcheck/test-layering-basic.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/common/libtest.sh b/tests/common/libtest.sh index b97dd075..d6cc2286 100644 --- a/tests/common/libtest.sh +++ b/tests/common/libtest.sh @@ -407,7 +407,7 @@ BuildArch: $arch # by default, we create a /usr/bin/$name script which just outputs $name %build -echo -e "#!/bin/sh\necho $name" > $name +echo -e "#!/bin/sh\necho $name-$version-$release.$arch" > $name chmod a+x $name $build diff --git a/tests/vmcheck/test-layering-basic.sh b/tests/vmcheck/test-layering-basic.sh index bb952231..f4ac3297 100755 --- a/tests/vmcheck/test-layering-basic.sh +++ b/tests/vmcheck/test-layering-basic.sh @@ -66,7 +66,7 @@ vm_assert_layered_pkg foo-1.0 present echo "ok pkg foo added" output=$(vm_cmd /usr/bin/foo) -if [[ $output != foo ]]; then +if [[ $output != foo-1.0-1.x86_64 ]]; then assert_not_reached "foo printed wrong output" fi echo "ok correct output"