sha1-file.c: mark more strings for translation

diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh
index bd11e5acb04f9991f987161e49e5601db186a502..dce102130fb77ddda7cdc9aa9211507d9c2f2e09 100755 (executable)
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@ -79,12 +79,12 @@ match_with_function() {
        if test "$match_expect" = 1
        then
                test_expect_success "$match_function: match '$text' '$pattern'" "
-                       test-wildmatch $match_function '$text' '$pattern'
+                       test-tool wildmatch $match_function '$text' '$pattern'
                "
        elif test "$match_expect" = 0
        then
                test_expect_success "$match_function: no match '$text' '$pattern'" "
-                       test_must_fail test-wildmatch $match_function '$text' '$pattern'
+                       test_must_fail test-tool wildmatch $match_function '$text' '$pattern'
                "
        else
                test_expect_success "PANIC: Test framework error. Unknown matches value $match_expect" 'false'
@@ -109,36 +109,36 @@ match_with_ls_files() {
        then
                if test -e .git/created_test_file
                then
-                       test_expect_success "$match_function (via ls-files): match dies on '$pattern' '$text'" "
+                       test_expect_success EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match dies on '$pattern' '$text'" "
                                printf '%s' '$text' >expect &&
                                test_must_fail git$ls_files_args ls-files -z -- '$pattern'
                        "
                else
-                       test_expect_failure "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
+                       test_expect_failure EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
                fi
        elif test "$match_expect" = 1
        then
                if test -e .git/created_test_file
                then
-                       test_expect_success "$match_function (via ls-files): match '$pattern' '$text'" "
+                       test_expect_success EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match '$pattern' '$text'" "
                                printf '%s' '$text' >expect &&
                                git$ls_files_args ls-files -z -- '$pattern' >actual.raw 2>actual.err &&
                                $match_stdout_stderr_cmp
                        "
                else
-                       test_expect_failure "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
+                       test_expect_failure EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): match skip '$pattern' '$text'" 'false'
                fi
        elif test "$match_expect" = 0
        then
                if test -e .git/created_test_file
                then
-                       test_expect_success "$match_function (via ls-files): no match '$pattern' '$text'" "
+                       test_expect_success EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): no match '$pattern' '$text'" "
                                >expect &&
                                git$ls_files_args ls-files -z -- '$pattern' >actual.raw 2>actual.err &&
                                $match_stdout_stderr_cmp
                        "
                else
-                       test_expect_failure "$match_function (via ls-files): no match skip '$pattern' '$text'" 'false'
+                       test_expect_failure EXPENSIVE_ON_WINDOWS "$match_function (via ls-files): no match skip '$pattern' '$text'" 'false'
                fi
        else
                test_expect_success "PANIC: Test framework error. Unknown matches value $match_expect" 'false'
@@ -148,7 +148,7 @@ match_with_ls_files() {
 match() {
        if test "$#" = 6
        then
-               # When test-wildmatch and git ls-files produce the same
+               # When test-tool wildmatch and git ls-files produce the same
                # result.
                match_glob=$1
                match_file_glob=$match_glob
@@ -174,7 +174,7 @@ match() {
                pattern=${10}
        fi
 
-       test_expect_success 'cleanup after previous file test' '
+       test_expect_success EXPENSIVE_ON_WINDOWS 'cleanup after previous file test' '
                if test -e .git/created_test_file
                then
                        git reset &&
@@ -184,7 +184,7 @@ match() {
 
        printf '%s' "$text" >.git/expected_test_file
 
-       test_expect_success "setup match file test for $text" '
+       test_expect_success EXPENSIVE_ON_WINDOWS "setup match file test for $text" '
                file=$(cat .git/expected_test_file) &&
                if should_create_test_file "$file"
                then
@@ -204,19 +204,19 @@ match() {
                fi
        '
 
-       # $1: Case sensitive glob match: test-wildmatch & ls-files
+       # $1: Case sensitive glob match: test-tool wildmatch & ls-files
        match_with_function "$text" "$pattern" $match_glob "wildmatch"
        match_with_ls_files "$text" "$pattern" $match_file_glob "wildmatch" " --glob-pathspecs"
 
-       # $2: Case insensitive glob match: test-wildmatch & ls-files
+       # $2: Case insensitive glob match: test-tool wildmatch & ls-files
        match_with_function "$text" "$pattern" $match_iglob "iwildmatch"
        match_with_ls_files "$text" "$pattern" $match_file_iglob "iwildmatch" " --glob-pathspecs --icase-pathspecs"
 
-       # $3: Case sensitive path match: test-wildmatch & ls-files
+       # $3: Case sensitive path match: test-tool wildmatch & ls-files
        match_with_function "$text" "$pattern" $match_pathmatch "pathmatch"
        match_with_ls_files "$text" "$pattern" $match_file_pathmatch "pathmatch" ""
 
-       # $4: Case insensitive path match: test-wildmatch & ls-files
+       # $4: Case insensitive path match: test-tool wildmatch & ls-files
        match_with_function "$text" "$pattern" $match_pathmatchi "ipathmatch"
        match_with_ls_files "$text" "$pattern" $match_file_pathmatchi "ipathmatch" " --icase-pathspecs"
 }