On 11/22/2019 2:17 AM, Jeff King wrote: > On Thu, Nov 21, 2019 at 03:51:56PM +0000, Derrick Stolee via GitGitGadget wrote: > >> The tests that check for the progress output have already been updated >> to use GIT_PROGRESS_DELAY=0 to force the expected output. However, there >> is one test in t6500-gc.sh that uses the test_terminal method. This >> mechanism does not preserve the GIT_PROGRESS_DELAY environment variable, >> so we need to modify check on the output. We still watch for the >> "Enumerating objects" progress but no longer look for "Computing >> commit graph generation numbers". > > I'm still puzzled by this paragraph. If I replace the test hunk in your > patch with this: > > diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh > index 7f79eedd1c..0a69a67117 100755 > --- a/t/t6500-gc.sh > +++ b/t/t6500-gc.sh > @@ -109,7 +109,8 @@ test_expect_success 'gc --no-quiet' ' > ' > > test_expect_success TTY 'with TTY: gc --no-quiet' ' > - test_terminal git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && > + test_terminal env GIT_PROGRESS_DELAY=0 \ > + git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && > test_must_be_empty stdout && > test_i18ngrep "Enumerating objects" stderr && > test_i18ngrep "Computing commit graph generation numbers" stderr > > the test works fine for me. Thanks! I was having trouble getting that to work by only inserting "GIT_PROCESS_DELAY=0" somewhere. The added "env" is what I was missing. -Stolee
