From: Glen Choo <chooglen@google.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Emily Shaffer" <emilyshaffer@google.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH 2/8] submodule tests: add tests for top-level flag output
Date: Thu, 03 Nov 2022 15:30:16 -0700 [thread overview]
Message-ID: <kl6lcza3oemf.fsf@chooglen-macbookpro.roam.corp.google.com> (raw)
In-Reply-To: <patch-2.8-cda36b5b6e0-20221102T074148Z-avarab@gmail.com>
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> Exhaustively test for how combining various "mixed-level" "git
> submodule" option works. "Mixed-level" here means options that are
> accepted by a mixture of the top-level "submodule" command, and
> e.g. the "status" sub-command.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> t/t7400-submodule-basic.sh | 10 +++
> t/t7422-submodule-output.sh | 169 ++++++++++++++++++++++++++++++++++++
> 2 files changed, 179 insertions(+)
> create mode 100755 t/t7422-submodule-output.sh
>
> diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
> index a989aafaf57..eae6a46ef3d 100755
> --- a/t/t7400-submodule-basic.sh
> +++ b/t/t7400-submodule-basic.sh
> @@ -579,6 +579,16 @@ test_expect_success 'status should be "modified" after submodule commit' '
> grep "^+$rev2" list
> '
>
> +test_expect_success '"submodule --cached" command forms should be identical' '
> + git submodule status --cached >expect &&
> +
> + git submodule --cached >actual &&
> + test_cmp expect actual &&
> +
> + git submodule --cached status >actual &&
> + test_cmp expect actual
> +'
> +
> test_expect_success 'the --cached sha1 should be rev1' '
> git submodule --cached status >list &&
> grep "^+$rev1" list
> diff --git a/t/t7422-submodule-output.sh b/t/t7422-submodule-output.sh
> new file mode 100755
> index 00000000000..3ac56c23f72
> --- /dev/null
> +++ b/t/t7422-submodule-output.sh
> @@ -0,0 +1,169 @@
> +#!/bin/sh
> +
> +test_description='submodule --cached, --quiet etc. output'
> +
> +. ./test-lib.sh
> +. "$TEST_DIRECTORY"/lib-t3100.sh
> +
> +setup_sub () {
> + local d="$1" &&
> + shift &&
> + git $@ clone . "$d" &&
> + git $@ submodule add ./"$d"
> +}
> +
> +normalize_status () {
> + sed -e 's/-g[0-9a-f]*/-gHASH/'
> +}
> +
> +test_expect_success 'setup' '
> + test_commit A &&
> + test_commit B &&
> + setup_sub S &&
> + setup_sub S.D &&
> + setup_sub S.C &&
> + setup_sub S.C.D &&
> + setup_sub X &&
> + git add S* &&
> + test_commit C &&
> +
> + # recursive in X/
> + git -C X pull &&
> + GIT_ALLOW_PROTOCOL=file git -C X submodule update --init &&
> +
> + # dirty p
> + for d in S.D X/S.D
> + do
> + echo dirty >S.D/A.t || return 1
> + done &&
I think this was meant to be replaced by the loop labelled # dirty ?
This doesn't look like it will work, e.g. $d isn't used.
> +
> + # commit (for --cached)
> + for d in S.C* X/S.C*
> + do
> + git -C "$d" reset --hard A || return 1
> + done &&
> +
> + # dirty
> + for d in S*.D X/S*.D
> + do
> + echo dirty >"$d/C2.t" || return 1
> + done &&
> +
> + for ref in A B C
> + do
> + # Not different with SHA-1 and SHA-256, just (ab)usign
> + # test_oid_cache as a variable bag to avoid using
> + # $(git rev-parse ...).
> + oid=$(git rev-parse $ref) &&
> + test_oid_cache <<-EOF || return 1
> + $ref sha1:$oid
> + $ref sha256:$oid
> + EOF
> + done
> +'
> +
> +for opts in "" "status"
> +do
> + test_expect_success "git submodule $opts" '
> + sed -e "s/^>//" >expect <<-EOF &&
> + > $(test_oid B) S (B)
> + >+$(test_oid A) S.C (A)
> + >+$(test_oid A) S.C.D (A)
> + > $(test_oid B) S.D (B)
> + >+$(test_oid C) X (C)
> + EOF
> + git submodule $opts >actual.raw &&
> + normalize_status <actual.raw >actual &&
> + test_cmp expect actual
> + '
> +done
> +
> +for opts in \
> + "status --recursive"
We don't test "--recursive status" or "--recursive" because we don't
parse the top level "--recursive" flag, right?
> +do
> + test_expect_success "git submodule $opts" '
> + sed -e "s/^>//" >expect <<-EOF &&
> + > $(test_oid B) S (B)
> + >+$(test_oid A) S.C (A)
> + >+$(test_oid A) S.C.D (A)
> + > $(test_oid B) S.D (B)
> + >+$(test_oid C) X (C)
> + > $(test_oid B) X/S (B)
> + >+$(test_oid A) X/S.C (A)
> + >+$(test_oid A) X/S.C.D (A)
> + > $(test_oid B) X/S.D (B)
> + > $(test_oid B) X/X (B)
> + EOF
> + git submodule $opts >actual.raw &&
> + normalize_status <actual.raw >actual &&
> + test_cmp expect actual
> + '
> +done
> +
> +for opts in \
> + "--quiet" \
> + "--quiet status" \
> + "status --quiet"
> +do
> + test_expect_success "git submodule $opts" '
> + git submodule $opts >out &&
> + test_must_be_empty out
> + '
> +done
> +
> +for opts in \
> + "--cached" \
> + "--cached status" \
> + "status --cached"
> +do
> + test_expect_success "git submodule $opts" '
> + sed -e "s/^>//" >expect <<-EOF &&
> + > $(test_oid B) S (B)
> + >+$(test_oid B) S.C (B)
> + >+$(test_oid B) S.C.D (B)
> + > $(test_oid B) S.D (B)
> + >+$(test_oid B) X (B)
> + EOF
> + git submodule $opts >actual.raw &&
> + normalize_status <actual.raw >actual &&
> + test_cmp expect actual
> + '
> +done
> +
> +for opts in \
> + "--cached --quiet" \
> + "--cached --quiet status" \
> + "--cached status --quiet" \
> + "--quiet status --cached" \
> + "status --cached --quiet"
> +do
> + test_expect_success "git submodule $opts" '
> + git submodule $opts >out &&
> + test_must_be_empty out
> + '
> +done
> +
> +for opts in \
> + "status --cached --recursive" \
> + "--cached status --recursive"
> +do
> + test_expect_success "git submodule $opts" '
> + sed -e "s/^>//" >expect <<-EOF &&
> + > $(test_oid B) S (B)
> + >+$(test_oid B) S.C (B)
> + >+$(test_oid B) S.C.D (B)
> + > $(test_oid B) S.D (B)
> + >+$(test_oid B) X (B)
> + > $(test_oid B) X/S (B)
> + >+$(test_oid B) X/S.C (B)
> + >+$(test_oid B) X/S.C.D (B)
> + > $(test_oid B) X/S.D (B)
> + > $(test_oid B) X/X (B)
> + EOF
> + git submodule $opts >actual.raw &&
> + normalize_status <actual.raw >actual &&
> + test_cmp expect actual
> + '
> +done
> +
> +test_done
> --
> 2.38.0.1280.g8136eb6fab2
next prev parent reply other threads:[~2022-11-03 22:30 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-02 7:53 [PATCH 0/8] submodule: tests, cleanup to prepare for built-in Ævar Arnfjörð Bjarmason
2022-11-02 7:53 ` [PATCH 1/8] submodule--helper: move "config" to a test-tool Ævar Arnfjörð Bjarmason
2022-11-03 22:09 ` Glen Choo
2022-11-02 7:53 ` [PATCH 2/8] submodule tests: add tests for top-level flag output Ævar Arnfjörð Bjarmason
2022-11-03 22:30 ` Glen Choo [this message]
2022-11-02 7:54 ` [PATCH 3/8] submodule tests: test for a "foreach" blind-spot Ævar Arnfjörð Bjarmason
2022-11-02 7:54 ` [PATCH 4/8] submodule.c: refactor recursive block out of absorb function Ævar Arnfjörð Bjarmason
2022-11-02 7:54 ` [PATCH 5/8] submodule API & "absorbgitdirs": remove "----recursive" option Ævar Arnfjörð Bjarmason
2022-11-03 22:53 ` Glen Choo
2022-11-04 1:42 ` Ævar Arnfjörð Bjarmason
2022-11-04 13:07 ` FW: " Simpson, Phyllis
2022-11-04 17:08 ` Glen Choo
2022-11-02 7:54 ` [PATCH 6/8] submodule--helper: remove --prefix from "absorbgitdirs" Ævar Arnfjörð Bjarmason
2022-11-02 7:54 ` [PATCH 7/8] submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update" Ævar Arnfjörð Bjarmason
2022-11-02 7:54 ` [PATCH 8/8] submodule--helper: use OPT_SUBCOMMAND() API Ævar Arnfjörð Bjarmason
2022-11-03 23:31 ` Glen Choo
2022-11-04 1:22 ` Ævar Arnfjörð Bjarmason
2022-11-04 17:02 ` Glen Choo
2022-11-05 14:23 ` Ævar Arnfjörð Bjarmason
2022-11-07 17:16 ` Glen Choo
2022-11-04 17:10 ` [PATCH 0/8] submodule: tests, cleanup to prepare for built-in Glen Choo
2022-11-04 19:07 ` Taylor Blau
2022-11-08 14:10 ` [PATCH v2 0/9] " Ævar Arnfjörð Bjarmason
2022-11-08 14:10 ` [PATCH v2 1/9] submodule--helper: move "config" to a test-tool Ævar Arnfjörð Bjarmason
2022-11-08 14:10 ` [PATCH v2 2/9] submodule tests: add tests for top-level flag output Ævar Arnfjörð Bjarmason
2022-11-08 14:10 ` [PATCH v2 3/9] submodule--helper: fix a memory leak in "status" Ævar Arnfjörð Bjarmason
2022-11-08 14:10 ` [PATCH v2 4/9] submodule tests: test for a "foreach" blind-spot Ævar Arnfjörð Bjarmason
2022-11-08 14:10 ` [PATCH v2 5/9] submodule.c: refactor recursive block out of absorb function Ævar Arnfjörð Bjarmason
2022-11-08 14:10 ` [PATCH v2 6/9] submodule API & "absorbgitdirs": remove "----recursive" option Ævar Arnfjörð Bjarmason
2022-11-08 14:10 ` [PATCH v2 7/9] submodule--helper: remove --prefix from "absorbgitdirs" Ævar Arnfjörð Bjarmason
2022-11-08 14:10 ` [PATCH v2 8/9] submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update" Ævar Arnfjörð Bjarmason
2022-11-08 14:10 ` [PATCH v2 9/9] submodule--helper: use OPT_SUBCOMMAND() API Ævar Arnfjörð Bjarmason
2022-11-08 18:30 ` [PATCH v2 0/9] submodule: tests, cleanup to prepare for built-in Glen Choo
2022-11-08 18:34 ` Ævar Arnfjörð Bjarmason
2022-11-08 19:20 ` Glen Choo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=kl6lcza3oemf.fsf@chooglen-macbookpro.roam.corp.google.com \
--to=chooglen@google.com \
--cc=avarab@gmail.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).