X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=t%2Fextract.t;h=17b2faa2da8a8f8797386a51621d48c9e7ed18be;hb=7b53df56cc94695572fa6ea8b075cf7e89b3690c;hp=b631006cc61702b3c6bbd93a6255cc100ffce1e2;hpb=a6ae868d213345dc2e599abf547a598a0626199a;p=zpackage

diff --git a/t/extract.t b/t/extract.t
index b631006..17b2faa 100755
--- a/t/extract.t
+++ b/t/extract.t
@@ -2,65 +2,7 @@
 
 # test addfile
 
-tn=0
-planned=0
-
-shownote() {
-	if [ "$note" != "" ]; then
-		printf '# %s\n' "$note"
-	fi
-}
-
-okexit() {
-	exitwith 0 "$*"
-}
-
-failsok() {
-	note=
-	if [ $? -eq 0 ]; then
-		printf 'not ';
-		note=$(printf '# got "%d" expected "%d"' "$1" "0")
-	fi
-	tn=$((tn + 1))
-	printf 'ok %d - %s\n' $tn "$*"
-	shownote
-}
-
-exitwith() {
-	note=
-	if [ $? -ne $1 ]; then
-		printf 'not ';
-		note=$(printf '# got "%d" expected "%d"' "$1" "$2")
-	fi
-	shift
-	tn=$((tn + 1))
-	printf 'ok %d - %s\n' $tn "$*"
-	shownote
-}
-
-okstreq() {
-	note=
-	if [ "$1" != "$2" ]; then
-		printf 'not ';
-		note=$(printf 'got "%s" expected "%s"' "$1" "$2")
-	fi
-
-	shift;shift;
-	tn=$((tn + 1))
-	printf 'ok %d - %s\n' $tn "$*"
-	shownote
-}
-
-plan() {
-	planned=$1
-	printf '1..%d\n' $planned
-}
-
-finish() {
-	if [ $planned -eq 0 ]; then
-		printf '1..%d\n' $tn
-	fi
-}
+. tap.sh
 
 plan 4
 
@@ -69,7 +11,7 @@ PF=test.db
 rm -f $PF test.foo
 echo foo > test.foo
 
-hash=$(./zpm-addfile $PF test.foo 2>> test.out)
+hash=$(zpm-addfile $PF test.foo 2>> test.out)
 save=$?
 
 okexit add foo file content
@@ -77,12 +19,12 @@ okstreq $hash b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c f
 
 rm -f foo
 
-./zpm-extract $PF $hash foo
-okexit  extract foo file content
+zpm-extract $PF $hash test.foo2
+okexit extract foo file content
 
-sha=$(sha256sum foo)
+sha=$(zpm-hash test.foo2)
 okstreq $hash $sha extracted hash matches
 
 finish
 
-#rm -f $PF test.empty
+rm -f test.*