have ctap prove read from stdin

[zpackage] / t / addtopackage.t

diff --git a/t/addtopackage.t b/t/addtopackage.t
index a0ef944edc1a58b600d9463bdb8a13a3cf289577..e8b0720609c6ee3e45f8be7a91bd43cf9781aa37 100755 (executable)
--- a/t/addtopackage.t
+++ b/t/addtopackage.t
@@ -7,25 +7,53 @@
 
 PF=test.db
 
-plan 7
+plan 17
 
 td=test.addtopackage
 rm -rf $td
 mkdir $td
 echo foo > $td/foo
+okexit 'making foo'
 
-tryrun zpm addtopackage zpmtest $td/foo
+rm -f zpmtest-1.0-1.zpm
+
+require zpm addtopackage -C zpmtest $td/foo
 h=$(zpm hash $td/foo)
-tryrun zpm extract zpmtest-1.0-1.zpm $h $td/foo2
+require zpm extract zpmtest-1.0-1.zpm $h $td/foo2
 h2=$(zpm hash $td/foo2)
-okstreq "$h" "$h2"
+okstreq "$h" "$h2" "foo and foo2 hash match"
+
 pkglist=$(zpm showpkg zpmtest-1.0-1.zpm)
 set $pkglist
-okstreq "$1" "zpmtest"
-okstreq "$2" "1.0"
-okstreq "$3" "1"
-okstreq "$4" "$td/foo"
+okstreq "$1" "zpmtest" package name
+okstreq "$2" "1.0" package version
+okstreq "$3" "1" package release
+okstreq "$4" "$td/foo" file foo in package
+diag "$pkglist"
+
+rm zpmtest-1.0-1.zpm
+
+require zpm addtopackage -C -f $PF zpmtest $td/foo
+rm -f $td/foo2
+require zpm extract $PF $h $td/foo2
+h2=$(zpm hash $td/foo2)
+okstreq "$h" "$h2"
+
+pkglist=$(zpm showpkg $PF)
+set $pkglist
+okstreq "$1" "zpmtest" package name
+okstreq "$2" "1.0" package version
+okstreq "$3" "1" package release
+okstreq "$4" "$td/foo" file foo in package
+diag "$pkglist"
+
+rm -f $PF
+require zpm addtopackage -C -f $PF -S "$td" zpmtest $td/foo
+fn=$(zpm showpkg $PF | awk '{print $4}')
+okstreq "$fn" "foo" file foo in package prefix striped
 
 finish
 
 rm -rf $td
+rm -f $PF
+rm -f zpmtest-1.0-1.zpm