X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=t%2Fadd.t;h=891a22d202889b8e47aa87ed1546e50e2d2e4af6;hb=62f6ff407bc4f2cf03d1fa7cf3dc9a3f4026624a;hp=bcfce8502e241c7a8c5566cffbea24e5a3734764;hpb=49a5985fd5ea8b77b7196c06b9d407805abe03d8;p=zpackage diff --git a/t/add.t b/t/add.t index bcfce85..891a22d 100755 --- a/t/add.t +++ b/t/add.t @@ -19,10 +19,10 @@ okexit 'making foo' pkgid=zpmtest-1.0-1 PF=zpmtest-1.0-1.zpm -require zpm newpackage -C $pkgid -require zpm add $pkgid foo +require -v zpm newpackage -C $pkgid +require -v zpm add -vvv -f $PF $pkgid foo h=$(zpm hash foo) -require zpm extract zpmtest-1.0-1.zpm $h foo2 +require -v zpm extract -f zpmtest-1.0-1.zpm $h foo2 h2=$(zpm hash foo2) okstreq "$h" "$h2" "foo and foo2 hash match" @@ -31,14 +31,14 @@ set $pkglist okstreq "$1" "zpmtest" package name okstreq "$2" "1.0" package version okstreq "$3" "1" package release -okstreq "$4" "foo" file foo in package +okstreq "$4" "/foo" file foo in package diag "$pkglist" rm -f $PF require zpm newpackage -f $PF -C $pkgid require zpm add -f $PF zpmtest foo rm -f foo2 -require zpm extract $PF $h foo2 +require zpm extract -f $PF $h foo2 h2=$(zpm hash foo2) okstreq "$h" "$h2" @@ -47,16 +47,16 @@ set $pkglist okstreq "$1" "zpmtest" package name okstreq "$2" "1.0" package version okstreq "$3" "1" package release -okstreq "$4" "foo" file foo in package +okstreq "$4" "/foo" file foo in package diag "$pkglist" rm -f $PF mkdir subdir touch subdir/foo require zpm newpackage -f $PF -C $pkgid -require zpm add -f $PF -S subdir zpmtest subdir/foo +require -v zpm add -f $PF -S subdir zpmtest subdir/foo fn=$(zpm showpkg $PF | awk '{print $4}') -okstreq "$fn" "foo" file foo in package prefix striped +okstreq "$fn" "/foo" file foo in package prefix striped rm -f $PF require zpm newpackage -f $PF -C $pkgid