Imported Upstream version 2.29.0

[platform/upstream/git.git] / t / t1050-large.sh

diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index 6fd264c..61e89a8 100755 (executable)
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -8,7 +8,7 @@ test_description='adding and checking out large blobs'
 # This should be moved to test-lib.sh together with the
 # copy in t0021 after both topics have graduated to 'master'.
 file_size () {
-       perl -e 'print -s $ARGV[0]' "$1"
+       test-tool path-utils file-size "$1"
 }
 
 test_expect_success setup '
@@ -53,7 +53,8 @@ test_expect_success 'add a large file or two' '
        for p in .git/objects/pack/pack-*.pack
        do
                count=$(( $count + 1 ))
-               if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx"
+               if test_path_is_file "$p" &&
+                  idx=${p%.pack}.idx && test_path_is_file "$idx"
                then
                        continue
                fi
@@ -63,9 +64,9 @@ test_expect_success 'add a large file or two' '
        test $count = 1 &&
        cnt=$(git show-index <"$idx" | wc -l) &&
        test $cnt = 2 &&
-       for l in .git/objects/??/??????????????????????????????????????
+       for l in .git/objects/$OIDPATH_REGEX
        do
-               test -f "$l" || continue
+               test_path_is_file "$l" || continue
                bad=t
        done &&
        test -z "$bad" &&
@@ -76,7 +77,8 @@ test_expect_success 'add a large file or two' '
        for p in .git/objects/pack/pack-*.pack
        do
                count=$(( $count + 1 ))
-               if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx"
+               if test_path_is_file "$p" &&
+                  idx=${p%.pack}.idx && test_path_is_file "$idx"
                then
                        continue
                fi
@@ -103,21 +105,21 @@ test_expect_success 'packsize limit' '
                # mid1 and mid2 will fit within 256k limit but
                # appending mid3 will bust the limit and will
                # result in a separate packfile.
-               test-genrandom "a" $(( 66 * 1024 )) >mid1 &&
-               test-genrandom "b" $(( 80 * 1024 )) >mid2 &&
-               test-genrandom "c" $(( 128 * 1024 )) >mid3 &&
+               test-tool genrandom "a" $(( 66 * 1024 )) >mid1 &&
+               test-tool genrandom "b" $(( 80 * 1024 )) >mid2 &&
+               test-tool genrandom "c" $(( 128 * 1024 )) >mid3 &&
                git add mid1 mid2 mid3 &&
 
-               count=0
+               count=0 &&
                for pi in .git/objects/pack/pack-*.idx
                do
-                       test -f "$pi" && count=$(( $count + 1 ))
+                       test_path_is_file "$pi" && count=$(( $count + 1 ))
                done &&
                test $count = 2 &&
 
                (
-                       git hash-object --stdin <mid1
-                       git hash-object --stdin <mid2
+                       git hash-object --stdin <mid1 &&
+                       git hash-object --stdin <mid2 &&
                        git hash-object --stdin <mid3
                ) |
                sort >expect &&
@@ -175,7 +177,8 @@ test_expect_success 'git-show a large file' '
 
 test_expect_success 'index-pack' '
        git clone file://"$(pwd)"/.git foo &&
-       GIT_DIR=non-existent git index-pack --strict --verify foo/.git/objects/pack/*.pack
+       GIT_DIR=non-existent git index-pack --object-format=$(test_oid algo) \
+               --strict --verify foo/.git/objects/pack/*.pack
 '
 
 test_expect_success 'repack' '
@@ -194,15 +197,15 @@ test_expect_success 'pack-objects with large loose object' '
        test_cmp huge actual
 '
 
-test_expect_success 'tar achiving' '
+test_expect_success 'tar archiving' '
        git archive --format=tar HEAD >/dev/null
 '
 
-test_expect_success 'zip achiving, store only' '
+test_expect_success 'zip archiving, store only' '
        git archive --format=zip -0 HEAD >/dev/null
 '
 
-test_expect_success 'zip achiving, deflate' '
+test_expect_success 'zip archiving, deflate' '
        git archive --format=zip HEAD >/dev/null
 '