summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-06-08 14:27:44 -0400
committerJune McEnroe <june@causal.agency>2021-06-08 14:27:44 -0400
commitf46c4521d761a0b9909e17ef29065c0aa09c7ab7 (patch)
tree37e7aec5ddc583047da1126ffdc41a81f20cf1f6 /tests
parentSquashed 'www/git.causal.agency/cgit/' content from commit 02221fd3 (diff)
downloadsrc-f46c4521d761a0b9909e17ef29065c0aa09c7ab7.tar.gz
src-f46c4521d761a0b9909e17ef29065c0aa09c7ab7.zip
Squashed 'www/git.causal.agency/cgit/' changes from 55fa25ad..5258c297
5258c297 git: update to v2.32.0
6dbbffe0 git: update to v2.31.1
62eb8db4 md2html: use proper formatting for hr
d889cae8 git: update to v2.31.0
4ffadc1e git: update to v2.30.1
bd6f5683 tests: t0107: support older and/or non-GNU tar
f69626c6 md2html: use sane_lists extension
cef27b67 git: update to v2.30.0
b1739247 git: update to v2.29.2
fe99c76e git: update to v2.29.1
adcc4f82 tests: try with commit-graph
a1039ab1 tests: do not copy snapshots to /tmp/
a4de0e81 global: replace hard coded hash length
779631c6 global: replace references to 'sha1' with 'oid'
629659d2 git: update to v2.29.0
205837d4 git: update to v2.28.0
f780396c git: update to v2.27.0
0462f08d git: update to v2.26.0

git-subtree-dir: www/git.causal.agency/cgit
git-subtree-split: 5258c297ba6fb604ae1415fbc19a3fe42457e49e
Diffstat (limited to '')
-rwxr-xr-xtests/setup.sh12
-rwxr-xr-xtests/t0001-validate-git-versions.sh4
-rwxr-xr-xtests/t0105-commit.sh2
-rwxr-xr-xtests/t0107-snapshot.sh17
-rwxr-xr-xtests/t0109-gitconfig.sh2
5 files changed, 19 insertions, 18 deletions
diff --git a/tests/setup.sh b/tests/setup.sh
index 5879348e..8db810ff 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -80,13 +80,17 @@ mkrepo() {
 			git commit -m "commit $n"
 			n=$(expr $n + 1)
 		done
-		if test "$3" = "testplus"
-		then
+		case "$3" in
+		testplus)
 			echo "hello" >a+b
 			git add a+b
 			git commit -m "add a+b"
 			git branch "1+2"
-		fi
+			;;
+		commit-graph)
+			git commit-graph write
+			;;
+		esac
 	)
 }
 
@@ -95,7 +99,7 @@ setup_repos()
 	rm -rf cache
 	mkdir -p cache
 	mkrepo repos/foo 5 >/dev/null
-	mkrepo repos/bar 50 >/dev/null
+	mkrepo repos/bar 50 commit-graph >/dev/null
 	mkrepo repos/foo+bar 10 testplus >/dev/null
 	mkrepo "repos/with space" 2 >/dev/null
 	mkrepo repos/filter 5 testplus >/dev/null
diff --git a/tests/t0001-validate-git-versions.sh b/tests/t0001-validate-git-versions.sh
index 73bd32f5..dd84fe3f 100755
--- a/tests/t0001-validate-git-versions.sh
+++ b/tests/t0001-validate-git-versions.sh
@@ -33,10 +33,10 @@ test_expect_success 'test submodule version matches Makefile' '
 	else
 		(
 			cd ../.. &&
-			sm_sha1=$(git ls-files --stage -- git |
+			sm_oid=$(git ls-files --stage -- git |
 				sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9]	.*$/\\1/") &&
 			cd git &&
-			git describe --match "v[0-9]*" $sm_sha1
+			git describe --match "v[0-9]*" $sm_oid
 		) | sed -e "s/^v//" -e "s/-/./" >sm_version &&
 		test_cmp sm_version makefile_version
 	fi
diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh
index 9cdf55c0..1a12ee39 100755
--- a/tests/t0105-commit.sh
+++ b/tests/t0105-commit.sh
@@ -25,7 +25,7 @@ test_expect_success 'get root commit' '
 '
 
 test_expect_success 'root commit contains diffstat' '
-	grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" tmp
+	grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40,64\}.>file-1</a>" tmp
 '
 
 test_expect_success 'root commit contains diff' '
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
index c164d3e2..0811ec40 100755
--- a/tests/t0107-snapshot.sh
+++ b/tests/t0107-snapshot.sh
@@ -25,7 +25,7 @@ test_expect_success 'verify gzip format' '
 
 test_expect_success 'untar' '
 	rm -rf master &&
-	tar -xzf master.tar.gz
+	gzip -dc master.tar.gz | tar -xf -
 '
 
 test_expect_success 'count files' '
@@ -61,13 +61,12 @@ test_expect_success LZIP 'strip off the header lines' '
 '
 
 test_expect_success LZIP 'verify lzip format' '
-	lzip --test master.tar.lz &&
-	cp master.tar.lz /tmp/.
+	lzip --test master.tar.lz
 '
 
 test_expect_success LZIP 'untar' '
 	rm -rf master &&
-	tar --lzip -xf master.tar.lz
+	lzip -dc master.tar.lz | tar -xf -
 '
 
 test_expect_success LZIP 'count files' '
@@ -103,13 +102,12 @@ test_expect_success XZ 'strip off the header lines' '
 '
 
 test_expect_success XZ 'verify xz format' '
-	xz --test master.tar.xz &&
-	cp master.tar.xz /tmp/.
+	xz --test master.tar.xz
 '
 
 test_expect_success XZ 'untar' '
 	rm -rf master &&
-	tar --xz -xf master.tar.xz
+	xz -dc master.tar.xz | tar -xf -
 '
 
 test_expect_success XZ 'count files' '
@@ -145,13 +143,12 @@ test_expect_success ZSTD 'strip off the header lines' '
 '
 
 test_expect_success ZSTD 'verify zstd format' '
-	zstd --test master.tar.zst &&
-	cp master.tar.zst /tmp/.
+	zstd --test master.tar.zst
 '
 
 test_expect_success ZSTD 'untar' '
 	rm -rf master &&
-	tar --zstd -xf master.tar.zst
+	zstd -dc master.tar.zst | tar -xf -
 '
 
 test_expect_success ZSTD 'count files' '
diff --git a/tests/t0109-gitconfig.sh b/tests/t0109-gitconfig.sh
index 8cee75cd..189ef281 100755
--- a/tests/t0109-gitconfig.sh
+++ b/tests/t0109-gitconfig.sh
@@ -25,7 +25,7 @@ test_no_home_access () {
 		-E CGIT_CONFIG="$PWD/cgitrc" \
 		-E QUERY_STRING="url=$1" \
 		-e access -f -o strace.out cgit &&
-	test_must_fail grep "$non_existent_path" strace.out
+	! grep "$non_existent_path" strace.out
 }
 
 test_no_home_access_success() {