rework zpm-add

[zpackage] / t / add.t

diff --git a/t/add.t b/t/add.t
index 891a22d202889b8e47aa87ed1546e50e2d2e4af6..0305c8d823c0d554a2b6188bca5b807d61d6b741 100755 (executable)
--- a/t/add.t
+++ b/t/add.t
@@ -7,7 +7,7 @@
 
 PF=test.db
 
-plan 32
+plan 34
 
 require rm -rf tmp
 require mkdir tmp
@@ -20,7 +20,7 @@ pkgid=zpmtest-1.0-1
 PF=zpmtest-1.0-1.zpm
 
 require -v zpm newpackage -C $pkgid
-require -v zpm add -vvv -f $PF $pkgid foo
+require -v zpm add -vvv -f $PF -p $pkgid foo
 h=$(zpm hash foo)
 require -v zpm extract -f zpmtest-1.0-1.zpm $h foo2
 h2=$(zpm hash foo2)
@@ -36,7 +36,7 @@ diag "$pkglist"
 
 rm -f $PF
 require zpm newpackage -f $PF -C $pkgid
-require zpm add -f $PF zpmtest foo
+require zpm add -f $PF -p zpmtest foo
 rm -f foo2
 require zpm extract -f $PF $h foo2
 h2=$(zpm hash foo2)
@@ -54,19 +54,19 @@ rm -f $PF
 mkdir subdir
 touch subdir/foo
 require zpm newpackage -f $PF -C $pkgid
-require -v zpm add -f $PF -S subdir zpmtest subdir/foo
+require -v zpm add -f $PF -S subdir -p zpmtest subdir/foo
 fn=$(zpm showpkg $PF | awk '{print $4}')
 okstreq "$fn" "/foo" file foo in package prefix striped
 rm -f $PF
 
 require zpm newpackage -f $PF -C $pkgid
-require zpm add -f $PF zpmtest foo
+require zpm add -f $PF -p zpmtest foo
 ph=$(zpm pkg -f $PF zpmtest hash)
 okstreq "$ph" "" package hash empty
 mtime=$(zpm pkg -f $PF zpmtest build_time)
 okstreq "$ph" "" package mtime empty
 
-zpm add -C -f $PF zpmtest subdir/foo
+zpm add -C -f $PF -p zpmtest subdir/foo
 okexit added file and completed package
 ph=$(zpm pkg -f $PF zpmtest hash)
 test -n "$ph"
@@ -77,12 +77,16 @@ test -n "$mtime"
 okexit package mtime not empty
 
 touch subdir/bar
-require zpm add -f $PF zpmtest subdir/bar
+require zpm add -f $PF -p zpmtest subdir/bar
 ph=$(zpm pkg -f $PF zpmtest hash)
 okstreq "$ph" "" package hash cleared
 mtime=$(zpm pkg -f $PF zpmtest build_time)
 okstreq "$ph" "" package mtime cleared
 
+echo junk data > subdir/baz
+require zpm add -f $PF subdir/baz
+rm $PF
+require zpm add -i -f $PF subdir/baz
 
 finish