add -f pkgfile option to addtopackage

[zpackage] / t / addtopackage.t

diff --git a/t/addtopackage.t b/t/addtopackage.t
index d3fd86fe78b9fd5f5c568b8e4c0e09508c9670ea..3252bec18aa7f9ca7b207747391209b0a7ef4252 100755 (executable)
--- a/t/addtopackage.t
+++ b/t/addtopackage.t
@@ -7,21 +7,21 @@
 
 PF=test.db
 
-plan 7
+plan 15
 
 td=test.addtopackage
 rm -rf $td
 mkdir $td
 echo foo > $td/foo
+okexit 'making foo'
 
-rm zpmtest-1.0-1.zpm
+rm -f zpmtest-1.0-1.zpm
 
 require zpm addtopackage zpmtest $td/foo
 h=$(zpm hash $td/foo)
 require zpm extract zpmtest-1.0-1.zpm $h $td/foo2
-ls -l $td
 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
@@ -31,7 +31,24 @@ okstreq "$3" "1" package release
 okstreq "$4" "$td/foo" file foo in package
 diag "$pkglist"
 
+rm zpmtest-1.0-1.zpm
+
+require zpm addtopackage -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"
 
 finish
 
 rm -rf $td
+rm -f $PF
+rm -f zpmtest-1.0-1.zpm