fix add tests to expect absolute paths

[zpackage] / t / add.t

diff --git a/t/add.t b/t/add.t
index 2fd9bb59f1909dd64b119343e20b03f093f30a2e..244321887fbcea9c032de71f530f1803a5af2fc4 100755 (executable)
--- a/t/add.t
+++ b/t/add.t
@@ -7,7 +7,7 @@
 
 PF=test.db
 
-plan 22
+plan 32
 
 require rm -rf tmp
 require mkdir tmp
@@ -17,6 +17,7 @@ echo foo > foo
 okexit 'making foo'
 
 pkgid=zpmtest-1.0-1
+PF=zpmtest-1.0-1.zpm
 
 require zpm newpackage -C $pkgid
 require zpm add $pkgid foo
@@ -30,11 +31,9 @@ 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 zpmtest-1.0-1.zpm
-
 rm -f $PF
 require zpm newpackage -f $PF -C $pkgid
 require zpm add -f $PF zpmtest foo
@@ -48,7 +47,7 @@ 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
@@ -57,9 +56,34 @@ touch subdir/foo
 require zpm newpackage -f $PF -C $pkgid
 require 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
+require zpm add -f $PF 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
+okexit added file and completed package
+ph=$(zpm pkg -f $PF zpmtest hash)
+test -n "$ph"
+okexit package hash not empty
+diag "hash: $ph"
+mtime=$(zpm pkg -f $PF zpmtest build_time)
+test -n "$mtime"
+okexit package mtime not empty
+
+touch subdir/bar
+require zpm add -f $PF 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
+
+
 finish
 
 cd ..