From 2ff614ec6d395325275ba7950c48c3e2f2f7f830 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Mon, 3 Dec 2018 08:33:05 +0000 Subject: [PATCH] fix stray chatter --- t/install.t | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/t/install.t b/t/install.t index c7efc77..b1ae113 100755 --- a/t/install.t +++ b/t/install.t @@ -59,7 +59,7 @@ PF=$pkgid.zpm # install via syncfs # require zpm pkg -f $PF $pkgid status=installing -zpm syncfs -d $PF -R. $pkgid 2>&1 +zpm syncfs -d $PF -R. $pkgid 2>&1 | diagstdin okexit ran syncfs test -f bin/true @@ -78,7 +78,7 @@ require rm -rf bin # TODO should probably have merge set the status to merged by default require zpm init local.db -zpm install -R. -d local.db -f $PF $pkgid +zpm install -R. -d local.db -f $PF $pkgid 2>&1 | diagstdin #zpm list -f local.db -v | diagstdin okexit installed ns=$(zpm pkg -f local.db $pkgid status) @@ -105,7 +105,7 @@ if [ $? -ne 0 ]; then bailout add failed fi -zpm install -R. -d local.db -f $PF itest-2.0-1 +zpm install -R. -d local.db -f $PF itest-2.0-1 2>&1 | diagstdin okexit installed if [ $? -ne 0 ]; then cat test.out | diagstdin @@ -127,7 +127,7 @@ pkgid=itest-3.0-1 newpkg $pkgid /bin/true okexit setup package $pkgid PF=$pkgid.zpm -zpm install -R. -d local.db -f $PF $pkgid | diagstdin +zpm install -R. -d local.db -f $PF $pkgid 2>&1 | diagstdin okexit upgraded to $pkgid ns=$(zpm pkg -f local.db $pkgid status) @@ -145,7 +145,7 @@ newpkg $pkgid bin/sh okexit setup package $pkgid require rm bin/sh PF=$pkgid.zpm -zpm install -R. -d local.db -f $PF $pkgid | diagstdin +zpm install -R. -d local.db -f $PF $pkgid 2>&1 | diagstdin okexit installed $pkgid oktest -f bin/sh @@ -161,7 +161,7 @@ newpkg $pkgid bin/true okexit setup package $pkgid require mv bin/save bin/true PF=$pkgid.zpm -zpm install -R. -d local.db -f $PF $pkgid | diagstdin +zpm install -R. -d local.db -f $PF $pkgid 2>&1 | diagstdin okexit installed $pkgid rhash=$(zpm hash bin/true) okstreq "$rhash" "$nhash" "updated bin/true" -- 2.40.0