From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 21 Sep 2021 13:03:01 +0300 Subject: chore(3p/git): Unvendor git and track patches instead This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b --- third_party/git/t/t0000-basic.sh | 1299 -------------------------------------- 1 file changed, 1299 deletions(-) delete mode 100755 third_party/git/t/t0000-basic.sh (limited to 'third_party/git/t/t0000-basic.sh') diff --git a/third_party/git/t/t0000-basic.sh b/third_party/git/t/t0000-basic.sh deleted file mode 100755 index 923281af9398..000000000000 --- a/third_party/git/t/t0000-basic.sh +++ /dev/null @@ -1,1299 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2005 Junio C Hamano -# - -test_description='Test the very basics part #1. - -The rest of the test suite does not check the basic operation of git -plumbing commands to work very carefully. Their job is to concentrate -on tricky features that caused bugs in the past to detect regression. - -This test runs very basic features, like registering things in cache, -writing tree, etc. - -Note that this test *deliberately* hard-codes many expected object -IDs. When object ID computation changes, like in the previous case of -swapping compression and hashing order, the person who is making the -modification *should* take notice and update the test vectors here. -' - -. ./test-lib.sh - -try_local_xy () { - local x="local" y="alsolocal" && - echo "$x $y" -} - -# Check whether the shell supports the "local" keyword. "local" is not -# POSIX-standard, but it is very widely supported by POSIX-compliant -# shells, and we rely on it within Git's test framework. -# -# If your shell fails this test, the results of other tests may be -# unreliable. You may wish to report the problem to the Git mailing -# list , as it could cause us to reconsider -# relying on "local". -test_expect_success 'verify that the running shell supports "local"' ' - x="notlocal" && - y="alsonotlocal" && - echo "local alsolocal" >expected1 && - try_local_xy >actual1 && - test_cmp expected1 actual1 && - echo "notlocal alsonotlocal" >expected2 && - echo "$x $y" >actual2 && - test_cmp expected2 actual2 -' - -################################################################ -# git init has been done in an empty repository. -# make sure it is empty. - -test_expect_success '.git/objects should be empty after git init in an empty repo' ' - find .git/objects -type f -print >should-be-empty && - test_line_count = 0 should-be-empty -' - -# also it should have 2 subdirectories; no fan-out anymore, pack, and info. -# 3 is counting "objects" itself -test_expect_success '.git/objects should have 3 subdirectories' ' - find .git/objects -type d -print >full-of-directories && - test_line_count = 3 full-of-directories -' - -################################################################ -# Test harness -test_expect_success 'success is reported like this' ' - : -' - -_run_sub_test_lib_test_common () { - neg="$1" name="$2" descr="$3" # stdin is the body of the test code - shift 3 - mkdir "$name" && - ( - # Pretend we're not running under a test harness, whether we - # are or not. The test-lib output depends on the setting of - # this variable, so we need a stable setting under which to run - # the sub-test. - sane_unset HARNESS_ACTIVE && - cd "$name" && - write_script "$name.sh" "$TEST_SHELL_PATH" <<-EOF && - test_description='$descr (run in sub test-lib) - - This is run in a sub test-lib so that we do not get incorrect - passing metrics - ' - - # Tell the framework that we are self-testing to make sure - # it yields a stable result. - GIT_TEST_FRAMEWORK_SELFTEST=t && - - # Point to the t/test-lib.sh, which isn't in ../ as usual - . "\$TEST_DIRECTORY"/test-lib.sh - EOF - cat >>"$name.sh" && - export TEST_DIRECTORY && - TEST_OUTPUT_DIRECTORY=$(pwd) && - export TEST_OUTPUT_DIRECTORY && - sane_unset GIT_TEST_FAIL_PREREQS && - if test -z "$neg" - then - ./"$name.sh" "$@" >out 2>err - else - ! ./"$name.sh" "$@" >out 2>err - fi - ) -} - -run_sub_test_lib_test () { - _run_sub_test_lib_test_common '' "$@" -} - -run_sub_test_lib_test_err () { - _run_sub_test_lib_test_common '!' "$@" -} - -check_sub_test_lib_test () { - name="$1" # stdin is the expected output from the test - ( - cd "$name" && - test_must_be_empty err && - sed -e 's/^> //' -e 's/Z$//' >expect && - test_cmp expect out - ) -} - -check_sub_test_lib_test_err () { - name="$1" # stdin is the expected output from the test - # expected error output is in descriptor 3 - ( - cd "$name" && - sed -e 's/^> //' -e 's/Z$//' >expect.out && - test_cmp expect.out out && - sed -e 's/^> //' -e 's/Z$//' <&3 >expect.err && - test_cmp expect.err err - ) -} - -test_expect_success 'pretend we have a fully passing test suite' " - run_sub_test_lib_test full-pass '3 passing tests' <<-\\EOF && - for i in 1 2 3 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test full-pass <<-\\EOF - > ok 1 - passing test #1 - > ok 2 - passing test #2 - > ok 3 - passing test #3 - > # passed all 3 test(s) - > 1..3 - EOF -" - -test_expect_success 'pretend we have a partially passing test suite' " - run_sub_test_lib_test_err \ - partial-pass '2/3 tests passing' <<-\\EOF && - test_expect_success 'passing test #1' 'true' - test_expect_success 'failing test #2' 'false' - test_expect_success 'passing test #3' 'true' - test_done - EOF - check_sub_test_lib_test partial-pass <<-\\EOF - > ok 1 - passing test #1 - > not ok 2 - failing test #2 - # false - > ok 3 - passing test #3 - > # failed 1 among 3 test(s) - > 1..3 - EOF -" - -test_expect_success 'pretend we have a known breakage' " - run_sub_test_lib_test failing-todo 'A failing TODO test' <<-\\EOF && - test_expect_success 'passing test' 'true' - test_expect_failure 'pretend we have a known breakage' 'false' - test_done - EOF - check_sub_test_lib_test failing-todo <<-\\EOF - > ok 1 - passing test - > not ok 2 - pretend we have a known breakage # TODO known breakage - > # still have 1 known breakage(s) - > # passed all remaining 1 test(s) - > 1..2 - EOF -" - -test_expect_success 'pretend we have fixed a known breakage' " - run_sub_test_lib_test passing-todo 'A passing TODO test' <<-\\EOF && - test_expect_failure 'pretend we have fixed a known breakage' 'true' - test_done - EOF - check_sub_test_lib_test passing-todo <<-\\EOF - > ok 1 - pretend we have fixed a known breakage # TODO known breakage vanished - > # 1 known breakage(s) vanished; please update test(s) - > 1..1 - EOF -" - -test_expect_success 'pretend we have fixed one of two known breakages (run in sub test-lib)' " - run_sub_test_lib_test partially-passing-todos \ - '2 TODO tests, one passing' <<-\\EOF && - test_expect_failure 'pretend we have a known breakage' 'false' - test_expect_success 'pretend we have a passing test' 'true' - test_expect_failure 'pretend we have fixed another known breakage' 'true' - test_done - EOF - check_sub_test_lib_test partially-passing-todos <<-\\EOF - > not ok 1 - pretend we have a known breakage # TODO known breakage - > ok 2 - pretend we have a passing test - > ok 3 - pretend we have fixed another known breakage # TODO known breakage vanished - > # 1 known breakage(s) vanished; please update test(s) - > # still have 1 known breakage(s) - > # passed all remaining 1 test(s) - > 1..3 - EOF -" - -test_expect_success 'pretend we have a pass, fail, and known breakage' " - run_sub_test_lib_test_err \ - mixed-results1 'mixed results #1' <<-\\EOF && - test_expect_success 'passing test' 'true' - test_expect_success 'failing test' 'false' - test_expect_failure 'pretend we have a known breakage' 'false' - test_done - EOF - check_sub_test_lib_test mixed-results1 <<-\\EOF - > ok 1 - passing test - > not ok 2 - failing test - > # false - > not ok 3 - pretend we have a known breakage # TODO known breakage - > # still have 1 known breakage(s) - > # failed 1 among remaining 2 test(s) - > 1..3 - EOF -" - -test_expect_success 'pretend we have a mix of all possible results' " - run_sub_test_lib_test_err \ - mixed-results2 'mixed results #2' <<-\\EOF && - test_expect_success 'passing test' 'true' - test_expect_success 'passing test' 'true' - test_expect_success 'passing test' 'true' - test_expect_success 'passing test' 'true' - test_expect_success 'failing test' 'false' - test_expect_success 'failing test' 'false' - test_expect_success 'failing test' 'false' - test_expect_failure 'pretend we have a known breakage' 'false' - test_expect_failure 'pretend we have a known breakage' 'false' - test_expect_failure 'pretend we have fixed a known breakage' 'true' - test_done - EOF - check_sub_test_lib_test mixed-results2 <<-\\EOF - > ok 1 - passing test - > ok 2 - passing test - > ok 3 - passing test - > ok 4 - passing test - > not ok 5 - failing test - > # false - > not ok 6 - failing test - > # false - > not ok 7 - failing test - > # false - > not ok 8 - pretend we have a known breakage # TODO known breakage - > not ok 9 - pretend we have a known breakage # TODO known breakage - > ok 10 - pretend we have fixed a known breakage # TODO known breakage vanished - > # 1 known breakage(s) vanished; please update test(s) - > # still have 2 known breakage(s) - > # failed 3 among remaining 7 test(s) - > 1..10 - EOF -" - -test_expect_success C_LOCALE_OUTPUT 'test --verbose' ' - run_sub_test_lib_test_err \ - t1234-verbose "test verbose" --verbose <<-\EOF && - test_expect_success "passing test" true - test_expect_success "test with output" "echo foo" - test_expect_success "failing test" false - test_done - EOF - mv t1234-verbose/out t1234-verbose/out+ && - grep -v "^Initialized empty" t1234-verbose/out+ >t1234-verbose/out && - check_sub_test_lib_test t1234-verbose <<-\EOF - > expecting success of 1234.1 '\''passing test'\'': true - > ok 1 - passing test - > Z - > expecting success of 1234.2 '\''test with output'\'': echo foo - > foo - > ok 2 - test with output - > Z - > expecting success of 1234.3 '\''failing test'\'': false - > not ok 3 - failing test - > # false - > Z - > # failed 1 among 3 test(s) - > 1..3 - EOF -' - -test_expect_success 'test --verbose-only' ' - run_sub_test_lib_test_err \ - t2345-verbose-only-2 "test verbose-only=2" \ - --verbose-only=2 <<-\EOF && - test_expect_success "passing test" true - test_expect_success "test with output" "echo foo" - test_expect_success "failing test" false - test_done - EOF - check_sub_test_lib_test t2345-verbose-only-2 <<-\EOF - > ok 1 - passing test - > Z - > expecting success of 2345.2 '\''test with output'\'': echo foo - > foo - > ok 2 - test with output - > Z - > not ok 3 - failing test - > # false - > # failed 1 among 3 test(s) - > 1..3 - EOF -' - -test_expect_success 'GIT_SKIP_TESTS' " - ( - GIT_SKIP_TESTS='git.2' && export GIT_SKIP_TESTS && - run_sub_test_lib_test git-skip-tests-basic \ - 'GIT_SKIP_TESTS' <<-\\EOF && - for i in 1 2 3 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test git-skip-tests-basic <<-\\EOF - > ok 1 - passing test #1 - > ok 2 # skip passing test #2 (GIT_SKIP_TESTS) - > ok 3 - passing test #3 - > # passed all 3 test(s) - > 1..3 - EOF - ) -" - -test_expect_success 'GIT_SKIP_TESTS several tests' " - ( - GIT_SKIP_TESTS='git.2 git.5' && export GIT_SKIP_TESTS && - run_sub_test_lib_test git-skip-tests-several \ - 'GIT_SKIP_TESTS several tests' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test git-skip-tests-several <<-\\EOF - > ok 1 - passing test #1 - > ok 2 # skip passing test #2 (GIT_SKIP_TESTS) - > ok 3 - passing test #3 - > ok 4 - passing test #4 - > ok 5 # skip passing test #5 (GIT_SKIP_TESTS) - > ok 6 - passing test #6 - > # passed all 6 test(s) - > 1..6 - EOF - ) -" - -test_expect_success 'GIT_SKIP_TESTS sh pattern' " - ( - GIT_SKIP_TESTS='git.[2-5]' && export GIT_SKIP_TESTS && - run_sub_test_lib_test git-skip-tests-sh-pattern \ - 'GIT_SKIP_TESTS sh pattern' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test git-skip-tests-sh-pattern <<-\\EOF - > ok 1 - passing test #1 - > ok 2 # skip passing test #2 (GIT_SKIP_TESTS) - > ok 3 # skip passing test #3 (GIT_SKIP_TESTS) - > ok 4 # skip passing test #4 (GIT_SKIP_TESTS) - > ok 5 # skip passing test #5 (GIT_SKIP_TESTS) - > ok 6 - passing test #6 - > # passed all 6 test(s) - > 1..6 - EOF - ) -" - -test_expect_success 'GIT_SKIP_TESTS entire suite' " - ( - GIT_SKIP_TESTS='git' && export GIT_SKIP_TESTS && - run_sub_test_lib_test git-skip-tests-entire-suite \ - 'GIT_SKIP_TESTS entire suite' <<-\\EOF && - for i in 1 2 3 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test git-skip-tests-entire-suite <<-\\EOF - > 1..0 # SKIP skip all tests in git - EOF - ) -" - -test_expect_success 'GIT_SKIP_TESTS does not skip unmatched suite' " - ( - GIT_SKIP_TESTS='notgit' && export GIT_SKIP_TESTS && - run_sub_test_lib_test git-skip-tests-unmatched-suite \ - 'GIT_SKIP_TESTS does not skip unmatched suite' <<-\\EOF && - for i in 1 2 3 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test git-skip-tests-unmatched-suite <<-\\EOF - > ok 1 - passing test #1 - > ok 2 - passing test #2 - > ok 3 - passing test #3 - > # passed all 3 test(s) - > 1..3 - EOF - ) -" - -test_expect_success '--run basic' " - run_sub_test_lib_test run-basic \ - '--run basic' --run='1 3 5' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test run-basic <<-\\EOF - > ok 1 - passing test #1 - > ok 2 # skip passing test #2 (--run) - > ok 3 - passing test #3 - > ok 4 # skip passing test #4 (--run) - > ok 5 - passing test #5 - > ok 6 # skip passing test #6 (--run) - > # passed all 6 test(s) - > 1..6 - EOF -" - -test_expect_success '--run with a range' " - run_sub_test_lib_test run-range \ - '--run with a range' --run='1-3' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test run-range <<-\\EOF - > ok 1 - passing test #1 - > ok 2 - passing test #2 - > ok 3 - passing test #3 - > ok 4 # skip passing test #4 (--run) - > ok 5 # skip passing test #5 (--run) - > ok 6 # skip passing test #6 (--run) - > # passed all 6 test(s) - > 1..6 - EOF -" - -test_expect_success '--run with two ranges' " - run_sub_test_lib_test run-two-ranges \ - '--run with two ranges' --run='1-2 5-6' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test run-two-ranges <<-\\EOF - > ok 1 - passing test #1 - > ok 2 - passing test #2 - > ok 3 # skip passing test #3 (--run) - > ok 4 # skip passing test #4 (--run) - > ok 5 - passing test #5 - > ok 6 - passing test #6 - > # passed all 6 test(s) - > 1..6 - EOF -" - -test_expect_success '--run with a left open range' " - run_sub_test_lib_test run-left-open-range \ - '--run with a left open range' --run='-3' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test run-left-open-range <<-\\EOF - > ok 1 - passing test #1 - > ok 2 - passing test #2 - > ok 3 - passing test #3 - > ok 4 # skip passing test #4 (--run) - > ok 5 # skip passing test #5 (--run) - > ok 6 # skip passing test #6 (--run) - > # passed all 6 test(s) - > 1..6 - EOF -" - -test_expect_success '--run with a right open range' " - run_sub_test_lib_test run-right-open-range \ - '--run with a right open range' --run='4-' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test run-right-open-range <<-\\EOF - > ok 1 # skip passing test #1 (--run) - > ok 2 # skip passing test #2 (--run) - > ok 3 # skip passing test #3 (--run) - > ok 4 - passing test #4 - > ok 5 - passing test #5 - > ok 6 - passing test #6 - > # passed all 6 test(s) - > 1..6 - EOF -" - -test_expect_success '--run with basic negation' " - run_sub_test_lib_test run-basic-neg \ - '--run with basic negation' --run='"'!3'"' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test run-basic-neg <<-\\EOF - > ok 1 - passing test #1 - > ok 2 - passing test #2 - > ok 3 # skip passing test #3 (--run) - > ok 4 - passing test #4 - > ok 5 - passing test #5 - > ok 6 - passing test #6 - > # passed all 6 test(s) - > 1..6 - EOF -" - -test_expect_success '--run with two negations' " - run_sub_test_lib_test run-two-neg \ - '--run with two negations' --run='"'!3 !6'"' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test run-two-neg <<-\\EOF - > ok 1 - passing test #1 - > ok 2 - passing test #2 - > ok 3 # skip passing test #3 (--run) - > ok 4 - passing test #4 - > ok 5 - passing test #5 - > ok 6 # skip passing test #6 (--run) - > # passed all 6 test(s) - > 1..6 - EOF -" - -test_expect_success '--run a range and negation' " - run_sub_test_lib_test run-range-and-neg \ - '--run a range and negation' --run='"'-4 !2'"' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test run-range-and-neg <<-\\EOF - > ok 1 - passing test #1 - > ok 2 # skip passing test #2 (--run) - > ok 3 - passing test #3 - > ok 4 - passing test #4 - > ok 5 # skip passing test #5 (--run) - > ok 6 # skip passing test #6 (--run) - > # passed all 6 test(s) - > 1..6 - EOF -" - -test_expect_success '--run range negation' " - run_sub_test_lib_test run-range-neg \ - '--run range negation' --run='"'!1-3'"' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test run-range-neg <<-\\EOF - > ok 1 # skip passing test #1 (--run) - > ok 2 # skip passing test #2 (--run) - > ok 3 # skip passing test #3 (--run) - > ok 4 - passing test #4 - > ok 5 - passing test #5 - > ok 6 - passing test #6 - > # passed all 6 test(s) - > 1..6 - EOF -" - -test_expect_success '--run include, exclude and include' " - run_sub_test_lib_test run-inc-neg-inc \ - '--run include, exclude and include' \ - --run='"'1-5 !1-3 2'"' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test run-inc-neg-inc <<-\\EOF - > ok 1 # skip passing test #1 (--run) - > ok 2 - passing test #2 - > ok 3 # skip passing test #3 (--run) - > ok 4 - passing test #4 - > ok 5 - passing test #5 - > ok 6 # skip passing test #6 (--run) - > # passed all 6 test(s) - > 1..6 - EOF -" - -test_expect_success '--run include, exclude and include, comma separated' " - run_sub_test_lib_test run-inc-neg-inc-comma \ - '--run include, exclude and include, comma separated' \ - --run=1-5,\!1-3,2 <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test run-inc-neg-inc-comma <<-\\EOF - > ok 1 # skip passing test #1 (--run) - > ok 2 - passing test #2 - > ok 3 # skip passing test #3 (--run) - > ok 4 - passing test #4 - > ok 5 - passing test #5 - > ok 6 # skip passing test #6 (--run) - > # passed all 6 test(s) - > 1..6 - EOF -" - -test_expect_success '--run exclude and include' " - run_sub_test_lib_test run-neg-inc \ - '--run exclude and include' \ - --run='"'!3- 5'"' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test run-neg-inc <<-\\EOF - > ok 1 - passing test #1 - > ok 2 - passing test #2 - > ok 3 # skip passing test #3 (--run) - > ok 4 # skip passing test #4 (--run) - > ok 5 - passing test #5 - > ok 6 # skip passing test #6 (--run) - > # passed all 6 test(s) - > 1..6 - EOF -" - -test_expect_success '--run empty selectors' " - run_sub_test_lib_test run-empty-sel \ - '--run empty selectors' \ - --run='1,,3,,,5' <<-\\EOF && - for i in 1 2 3 4 5 6 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test run-empty-sel <<-\\EOF - > ok 1 - passing test #1 - > ok 2 # skip passing test #2 (--run) - > ok 3 - passing test #3 - > ok 4 # skip passing test #4 (--run) - > ok 5 - passing test #5 - > ok 6 # skip passing test #6 (--run) - > # passed all 6 test(s) - > 1..6 - EOF -" - -test_expect_success '--run invalid range start' " - run_sub_test_lib_test_err run-inv-range-start \ - '--run invalid range start' \ - --run='a-5' <<-\\EOF && - test_expect_success \"passing test #1\" 'true' - test_done - EOF - check_sub_test_lib_test_err run-inv-range-start \ - <<-\\EOF_OUT 3<<-\\EOF_ERR - > FATAL: Unexpected exit with code 1 - EOF_OUT - > error: --run: invalid non-numeric in range start: 'a-5' - EOF_ERR -" - -test_expect_success '--run invalid range end' " - run_sub_test_lib_test_err run-inv-range-end \ - '--run invalid range end' \ - --run='1-z' <<-\\EOF && - test_expect_success \"passing test #1\" 'true' - test_done - EOF - check_sub_test_lib_test_err run-inv-range-end \ - <<-\\EOF_OUT 3<<-\\EOF_ERR - > FATAL: Unexpected exit with code 1 - EOF_OUT - > error: --run: invalid non-numeric in range end: '1-z' - EOF_ERR -" - -test_expect_success '--run invalid selector' " - run_sub_test_lib_test_err run-inv-selector \ - '--run invalid selector' \ - --run='1?' <<-\\EOF && - test_expect_success \"passing test #1\" 'true' - test_done - EOF - check_sub_test_lib_test_err run-inv-selector \ - <<-\\EOF_OUT 3<<-\\EOF_ERR - > FATAL: Unexpected exit with code 1 - EOF_OUT - > error: --run: invalid non-numeric in test selector: '1?' - EOF_ERR -" - - -test_set_prereq HAVEIT -haveit=no -test_expect_success HAVEIT 'test runs if prerequisite is satisfied' ' - test_have_prereq HAVEIT && - haveit=yes -' -donthaveit=yes -test_expect_success DONTHAVEIT 'unmet prerequisite causes test to be skipped' ' - donthaveit=no -' -if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $haveit$donthaveit != yesyes -then - say "bug in test framework: prerequisite tags do not work reliably" - exit 1 -fi - -test_set_prereq HAVETHIS -haveit=no -test_expect_success HAVETHIS,HAVEIT 'test runs if prerequisites are satisfied' ' - test_have_prereq HAVEIT && - test_have_prereq HAVETHIS && - haveit=yes -' -donthaveit=yes -test_expect_success HAVEIT,DONTHAVEIT 'unmet prerequisites causes test to be skipped' ' - donthaveit=no -' -donthaveiteither=yes -test_expect_success DONTHAVEIT,HAVEIT 'unmet prerequisites causes test to be skipped' ' - donthaveiteither=no -' -if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $haveit$donthaveit$donthaveiteither != yesyesyes -then - say "bug in test framework: multiple prerequisite tags do not work reliably" - exit 1 -fi - -test_lazy_prereq LAZY_TRUE true -havetrue=no -test_expect_success LAZY_TRUE 'test runs if lazy prereq is satisfied' ' - havetrue=yes -' -donthavetrue=yes -test_expect_success !LAZY_TRUE 'missing lazy prereqs skip tests' ' - donthavetrue=no -' - -if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a "$havetrue$donthavetrue" != yesyes -then - say 'bug in test framework: lazy prerequisites do not work' - exit 1 -fi - -test_lazy_prereq LAZY_FALSE false -nothavefalse=no -test_expect_success !LAZY_FALSE 'negative lazy prereqs checked' ' - nothavefalse=yes -' -havefalse=yes -test_expect_success LAZY_FALSE 'missing negative lazy prereqs will skip' ' - havefalse=no -' - -if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a "$nothavefalse$havefalse" != yesyes -then - say 'bug in test framework: negative lazy prerequisites do not work' - exit 1 -fi - -clean=no -test_expect_success 'tests clean up after themselves' ' - test_when_finished clean=yes -' - -if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $clean != yes -then - say "bug in test framework: basic cleanup command does not work reliably" - exit 1 -fi - -test_expect_success 'lazy prereqs do not turn off tracing' " - run_sub_test_lib_test lazy-prereq-and-tracing \ - 'lazy prereqs and -x' -v -x <<-\\EOF && - test_lazy_prereq LAZY true - - test_expect_success lazy 'test_have_prereq LAZY && echo trace' - - test_done - EOF - - grep 'echo trace' lazy-prereq-and-tracing/err -" - -test_expect_success 'tests clean up even on failures' " - run_sub_test_lib_test_err \ - failing-cleanup 'Failing tests with cleanup commands' <<-\\EOF && - test_expect_success 'tests clean up even after a failure' ' - touch clean-after-failure && - test_when_finished rm clean-after-failure && - (exit 1) - ' - test_expect_success 'failure to clean up causes the test to fail' ' - test_when_finished \"(exit 2)\" - ' - test_done - EOF - check_sub_test_lib_test failing-cleanup <<-\\EOF - > not ok 1 - tests clean up even after a failure - > # Z - > # touch clean-after-failure && - > # test_when_finished rm clean-after-failure && - > # (exit 1) - > # Z - > not ok 2 - failure to clean up causes the test to fail - > # Z - > # test_when_finished \"(exit 2)\" - > # Z - > # failed 2 among 2 test(s) - > 1..2 - EOF -" - -test_expect_success 'test_atexit is run' " - run_sub_test_lib_test_err \ - atexit-cleanup 'Run atexit commands' -i <<-\\EOF && - test_expect_success 'tests clean up even after a failure' ' - > ../../clean-atexit && - test_atexit rm ../../clean-atexit && - > ../../also-clean-atexit && - test_atexit rm ../../also-clean-atexit && - > ../../dont-clean-atexit && - (exit 1) - ' - test_done - EOF - test_path_is_file dont-clean-atexit && - test_path_is_missing clean-atexit && - test_path_is_missing also-clean-atexit -" - -test_expect_success 'test_oid provides sane info by default' ' - test_oid zero >actual && - grep "^00*\$" actual && - rawsz="$(test_oid rawsz)" && - hexsz="$(test_oid hexsz)" && - test "$hexsz" -eq $(wc -c actual && - grep "^00*\$" actual && - rawsz="$(test_oid rawsz)" && - hexsz="$(test_oid hexsz)" && - test $(wc -c actual && - grep "^00*\$" actual && - rawsz="$(test_oid rawsz)" && - hexsz="$(test_oid hexsz)" && - test $(wc -c err && - grep "error: test_bool_env requires bool values" err && - - envvar=true && - ! ( test_bool_env envvar invalid ) 7>err && - grep "error: test_bool_env requires bool values" err - ) -' - -################################################################ -# Basics of the basics - -test_oid_cache <<\EOF -path0f sha1:f87290f8eb2cbbea7857214459a0739927eab154 -path0f sha256:638106af7c38be056f3212cbd7ac65bc1bac74f420ca5a436ff006a9d025d17d - -path0s sha1:15a98433ae33114b085f3eb3bb03b832b3180a01 -path0s sha256:3a24cc53cf68edddac490bbf94a418a52932130541361f685df685e41dd6c363 - -path2f sha1:3feff949ed00a62d9f7af97c15cd8a30595e7ac7 -path2f sha256:2a7f36571c6fdbaf0e3f62751a0b25a3f4c54d2d1137b3f4af9cb794bb498e5f - -path2s sha1:d8ce161addc5173867a3c3c730924388daedbc38 -path2s sha256:18fd611b787c2e938ddcc248fabe4d66a150f9364763e9ec133dd01d5bb7c65a - -path2d sha1:58a09c23e2ca152193f2786e06986b7b6712bdbe -path2d sha256:00e4b32b96e7e3d65d79112dcbea53238a22715f896933a62b811377e2650c17 - -path3f sha1:0aa34cae68d0878578ad119c86ca2b5ed5b28376 -path3f sha256:09f58616b951bd571b8cb9dc76d372fbb09ab99db2393f5ab3189d26c45099ad - -path3s sha1:8599103969b43aff7e430efea79ca4636466794f -path3s sha256:fce1aed087c053306f3f74c32c1a838c662bbc4551a7ac2420f5d6eb061374d0 - -path3d sha1:21ae8269cacbe57ae09138dcc3a2887f904d02b3 -path3d sha256:9b60497be959cb830bf3f0dc82bcc9ad9e925a24e480837ade46b2295e47efe1 - -subp3f sha1:00fb5908cb97c2564a9783c0c64087333b3b464f -subp3f sha256:a1a9e16998c988453f18313d10375ee1d0ddefe757e710dcae0d66aa1e0c58b3 - -subp3s sha1:6649a1ebe9e9f1c553b66f5a6e74136a07ccc57c -subp3s sha256:81759d9f5e93c6546ecfcadb560c1ff057314b09f93fe8ec06e2d8610d34ef10 - -subp3d sha1:3c5e5399f3a333eddecce7a9b9465b63f65f51e2 -subp3d sha256:76b4ef482d4fa1c754390344cf3851c7f883b27cf9bc999c6547928c46aeafb7 - -root sha1:087704a96baf1c2d1c869a8b084481e121c88b5b -root sha256:9481b52abab1b2ffeedbf9de63ce422b929f179c1b98ff7bee5f8f1bc0710751 - -simpletree sha1:7bb943559a305bdd6bdee2cef6e5df2413c3d30a -simpletree sha256:1710c07a6c86f9a3c7376364df04c47ee39e5a5e221fcdd84b743bc9bb7e2bc5 -EOF - -# updating a new file without --add should fail. -test_expect_success 'git update-index without --add should fail adding' ' - test_must_fail git update-index should-be-empty -' - -# and with --add it should succeed, even if it is empty (it used to fail). -test_expect_success 'git update-index with --add should succeed' ' - git update-index --add should-be-empty -' - -test_expect_success 'writing tree out with git write-tree' ' - tree=$(git write-tree) -' - -# we know the shape and contents of the tree and know the object ID for it. -test_expect_success 'validate object ID of a known tree' ' - test "$tree" = "$(test_oid simpletree)" - ' - -# Removing paths. -test_expect_success 'git update-index without --remove should fail removing' ' - rm -f should-be-empty full-of-directories && - test_must_fail git update-index should-be-empty -' - -test_expect_success 'git update-index with --remove should be able to remove' ' - git update-index --remove should-be-empty -' - -# Empty tree can be written with recent write-tree. -test_expect_success 'git write-tree should be able to write an empty tree' ' - tree=$(git write-tree) -' - -test_expect_success 'validate object ID of a known tree' ' - test "$tree" = $EMPTY_TREE -' - -# Various types of objects - -test_expect_success 'adding various types of objects with git update-index --add' ' - mkdir path2 path3 path3/subp3 && - paths="path0 path2/file2 path3/file3 path3/subp3/file3" && - ( - for p in $paths - do - echo "hello $p" >$p || exit 1 - test_ln_s_add "hello $p" ${p}sym || exit 1 - done - ) && - find path* ! -type d -print | xargs git update-index --add -' - -# Show them and see that matches what we expect. -test_expect_success 'showing stage with git ls-files --stage' ' - git ls-files --stage >current -' - -test_expect_success 'validate git ls-files output for a known tree' ' - cat >expected <<-EOF && - 100644 $(test_oid path0f) 0 path0 - 120000 $(test_oid path0s) 0 path0sym - 100644 $(test_oid path2f) 0 path2/file2 - 120000 $(test_oid path2s) 0 path2/file2sym - 100644 $(test_oid path3f) 0 path3/file3 - 120000 $(test_oid path3s) 0 path3/file3sym - 100644 $(test_oid subp3f) 0 path3/subp3/file3 - 120000 $(test_oid subp3s) 0 path3/subp3/file3sym - EOF - test_cmp expected current -' - -test_expect_success 'writing tree out with git write-tree' ' - tree=$(git write-tree) -' - -test_expect_success 'validate object ID for a known tree' ' - test "$tree" = "$(test_oid root)" -' - -test_expect_success 'showing tree with git ls-tree' ' - git ls-tree $tree >current -' - -test_expect_success 'git ls-tree output for a known tree' ' - cat >expected <<-EOF && - 100644 blob $(test_oid path0f) path0 - 120000 blob $(test_oid path0s) path0sym - 040000 tree $(test_oid path2d) path2 - 040000 tree $(test_oid path3d) path3 - EOF - test_cmp expected current -' - -# This changed in ls-tree pathspec change -- recursive does -# not show tree nodes anymore. -test_expect_success 'showing tree with git ls-tree -r' ' - git ls-tree -r $tree >current -' - -test_expect_success 'git ls-tree -r output for a known tree' ' - cat >expected <<-EOF && - 100644 blob $(test_oid path0f) path0 - 120000 blob $(test_oid path0s) path0sym - 100644 blob $(test_oid path2f) path2/file2 - 120000 blob $(test_oid path2s) path2/file2sym - 100644 blob $(test_oid path3f) path3/file3 - 120000 blob $(test_oid path3s) path3/file3sym - 100644 blob $(test_oid subp3f) path3/subp3/file3 - 120000 blob $(test_oid subp3s) path3/subp3/file3sym - EOF - test_cmp expected current -' - -# But with -r -t we can have both. -test_expect_success 'showing tree with git ls-tree -r -t' ' - git ls-tree -r -t $tree >current -' - -test_expect_success 'git ls-tree -r output for a known tree' ' - cat >expected <<-EOF && - 100644 blob $(test_oid path0f) path0 - 120000 blob $(test_oid path0s) path0sym - 040000 tree $(test_oid path2d) path2 - 100644 blob $(test_oid path2f) path2/file2 - 120000 blob $(test_oid path2s) path2/file2sym - 040000 tree $(test_oid path3d) path3 - 100644 blob $(test_oid path3f) path3/file3 - 120000 blob $(test_oid path3s) path3/file3sym - 040000 tree $(test_oid subp3d) path3/subp3 - 100644 blob $(test_oid subp3f) path3/subp3/file3 - 120000 blob $(test_oid subp3s) path3/subp3/file3sym - EOF - test_cmp expected current -' - -test_expect_success 'writing partial tree out with git write-tree --prefix' ' - ptree=$(git write-tree --prefix=path3) -' - -test_expect_success 'validate object ID for a known tree' ' - test "$ptree" = $(test_oid path3d) -' - -test_expect_success 'writing partial tree out with git write-tree --prefix' ' - ptree=$(git write-tree --prefix=path3/subp3) -' - -test_expect_success 'validate object ID for a known tree' ' - test "$ptree" = $(test_oid subp3d) -' - -test_expect_success 'put invalid objects into the index' ' - rm -f .git/index && - suffix=$(echo $ZERO_OID | sed -e "s/^.//") && - cat >badobjects <<-EOF && - 100644 blob $(test_oid 001) dir/file1 - 100644 blob $(test_oid 002) dir/file2 - 100644 blob $(test_oid 003) dir/file3 - 100644 blob $(test_oid 004) dir/file4 - 100644 blob $(test_oid 005) dir/file5 - EOF - git update-index --index-info expected <current && - test_cmp expected current -' - -test_expect_success 'git update-index --refresh should succeed' ' - git update-index --refresh -' - -test_expect_success 'no diff after checkout and git update-index --refresh' ' - git diff-files >current && - cmp -s current /dev/null -' - -################################################################ -P=$(test_oid root) - -test_expect_success 'git commit-tree records the correct tree in a commit' ' - commit0=$(echo NO | git commit-tree $P) && - tree=$(git show --pretty=raw $commit0 | - sed -n -e "s/^tree //p" -e "/^author /q") && - test "z$tree" = "z$P" -' - -test_expect_success 'git commit-tree records the correct parent in a commit' ' - commit1=$(echo NO | git commit-tree $P -p $commit0) && - parent=$(git show --pretty=raw $commit1 | - sed -n -e "s/^parent //p" -e "/^author /q") && - test "z$commit0" = "z$parent" -' - -test_expect_success 'git commit-tree omits duplicated parent in a commit' ' - commit2=$(echo NO | git commit-tree $P -p $commit0 -p $commit0) && - parent=$(git show --pretty=raw $commit2 | - sed -n -e "s/^parent //p" -e "/^author /q" | - sort -u) && - test "z$commit0" = "z$parent" && - numparent=$(git show --pretty=raw $commit2 | - sed -n -e "s/^parent //p" -e "/^author /q" | - wc -l) && - test $numparent = 1 -' - -test_expect_success 'update-index D/F conflict' ' - mv path0 tmp && - mv path2 path0 && - mv tmp path2 && - git update-index --add --replace path2 path0/file2 && - numpath0=$(git ls-files path0 | wc -l) && - test $numpath0 = 1 -' - -test_expect_success 'very long name in the index handled sanely' ' - - a=a && # 1 - a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 16 - a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 256 - a=$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a$a && # 4096 - a=${a}q && - - >path4 && - git update-index --add path4 && - ( - git ls-files -s path4 | - sed -e "s/ .*/ /" | - tr -d "\012" && - echo "$a" - ) | git update-index --index-info && - len=$(git ls-files "a*" | wc -c) && - test $len = 4098 -' - -test_expect_success 'test_must_fail on a failing git command' ' - test_must_fail git notacommand -' - -test_expect_success 'test_must_fail on a failing git command with env' ' - test_must_fail env var1=a var2=b git notacommand -' - -test_expect_success 'test_must_fail rejects a non-git command' ' - ! test_must_fail grep ^$ notafile 2>err && - grep -F "test_must_fail: only '"'"'git'"'"' is allowed" err -' - -test_expect_success 'test_must_fail rejects a non-git command with env' ' - ! test_must_fail env var1=a var2=b grep ^$ notafile 2>err && - grep -F "test_must_fail: only '"'"'git'"'"' is allowed" err -' - -test_done -- cgit 1.4.1