Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/setup.sh | 12 | ||||
| -rwxr-xr-x | tests/t0105-commit.sh | 2 | ||||
| -rwxr-xr-x | tests/t0107-snapshot.sh | 17 |
3 files changed, 15 insertions, 16 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 8db810f..5879348 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -80,17 +80,13 @@ mkrepo() { git commit -m "commit $n" n=$(expr $n + 1) done - case "$3" in - testplus) + if test "$3" = "testplus" + then echo "hello" >a+b git add a+b git commit -m "add a+b" git branch "1+2" - ;; - commit-graph) - git commit-graph write - ;; - esac + fi ) } @@ -99,7 +95,7 @@ setup_repos() rm -rf cache mkdir -p cache mkrepo repos/foo 5 >/dev/null - mkrepo repos/bar 50 commit-graph >/dev/null + mkrepo repos/bar 50 >/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/t0105-commit.sh b/tests/t0105-commit.sh index 1a12ee3..9cdf55c 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,64\}.>file-1</a>" tmp + grep "<a href=./foo/diff/file-1.id=[0-9a-f]\{40\}.>file-1</a>" tmp ' test_expect_success 'root commit contains diff' ' diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh index 0811ec4..c164d3e 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 && - gzip -dc master.tar.gz | tar -xf - + tar -xzf master.tar.gz ' test_expect_success 'count files' ' @@ -61,12 +61,13 @@ test_expect_success LZIP 'strip off the header lines' ' ' test_expect_success LZIP 'verify lzip format' ' - lzip --test master.tar.lz + lzip --test master.tar.lz && + cp master.tar.lz /tmp/. ' test_expect_success LZIP 'untar' ' rm -rf master && - lzip -dc master.tar.lz | tar -xf - + tar --lzip -xf master.tar.lz ' test_expect_success LZIP 'count files' ' @@ -102,12 +103,13 @@ test_expect_success XZ 'strip off the header lines' ' ' test_expect_success XZ 'verify xz format' ' - xz --test master.tar.xz + xz --test master.tar.xz && + cp master.tar.xz /tmp/. ' test_expect_success XZ 'untar' ' rm -rf master && - xz -dc master.tar.xz | tar -xf - + tar --xz -xf master.tar.xz ' test_expect_success XZ 'count files' ' @@ -143,12 +145,13 @@ test_expect_success ZSTD 'strip off the header lines' ' ' test_expect_success ZSTD 'verify zstd format' ' - zstd --test master.tar.zst + zstd --test master.tar.zst && + cp master.tar.zst /tmp/. ' test_expect_success ZSTD 'untar' ' rm -rf master && - zstd -dc master.tar.zst | tar -xf - + tar --zstd -xf master.tar.zst ' test_expect_success ZSTD 'count files' ' |