remove create option to zpm-add

[zpackage] / t / add.t

diff --git a/t/add.t b/t/add.t
index 4f0725d392e65561684e9ad346c6a259325ee247..3463afb11955602fe545a7050dff550112f81491 100755 (executable)
--- a/t/add.t
+++ b/t/add.t
@@ -7,7 +7,7 @@
 
 PF=test.db
 
-plan 17
+plan 20
 
 td=test.addtopackage
 rm -rf $td
@@ -15,9 +15,12 @@ mkdir $td
 echo foo > $td/foo
 okexit 'making foo'
 
-rm -f zpmtest-1.0-1.zpm
+pkgid=zpmtest-1.0-1
+
+rm -f $pkgid.zpm
 
-require zpm add -C zpmtest $td/foo
+require zpm newpackage -C $pkgid
+require zpm add $pkgid $td/foo
 h=$(zpm hash $td/foo)
 require zpm extract zpmtest-1.0-1.zpm $h $td/foo2
 h2=$(zpm hash $td/foo2)
@@ -31,9 +34,11 @@ okstreq "$3" "1" package release
 okstreq "$4" "$td/foo" file foo in package
 diag "$pkglist"
 
-rm zpmtest-1.0-1.zpm
+rm -f zpmtest-1.0-1.zpm
 
-require zpm add -C -f $PF zpmtest $td/foo
+rm -f $PF
+require zpm newpackage -f $PF -C $pkgid
+require zpm add -f $PF zpmtest $td/foo
 rm -f $td/foo2
 require zpm extract $PF $h $td/foo2
 h2=$(zpm hash $td/foo2)
@@ -48,12 +53,12 @@ okstreq "$4" "$td/foo" file foo in package
 diag "$pkglist"
 
 rm -f $PF
-require zpm add -C -f $PF -S "$td" zpmtest $td/foo
+require zpm newpackage -f $PF -C $pkgid
+require zpm add -f $PF -S "$td" zpmtest $td/foo
 fn=$(zpm showpkg $PF | awk '{print $4}')
 okstreq "$fn" "foo" file foo in package prefix striped
+rm -f $PF
 
 finish
 
 rm -rf $td
-rm -f $PF
-rm -f zpmtest-1.0-1.zpm