Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

t/t0014: fix: eliminate additional lines from trace #2655

Merged
merged 2 commits into from
Oct 9, 2020
Merged

t/t0014: fix: eliminate additional lines from trace #2655

merged 2 commits into from
Oct 9, 2020

Conversation

jglathe
Copy link

@jglathe jglathe commented Jun 2, 2020

trace on git for windows delivers extra info which makes test
'run-command formats empty args properly' fail:

$ cat actual.raw
10:49:28.858579 exec-cmd.c:237 trace: resolved executable dir: C:/git-sdk-64/mingw64/bin
10:49:28.872991 git.c:702 trace: exec: git-frotz a '' b ' ' c
10:49:28.872991 run-command.c:663 trace: run_command: git-frotz a '' b ' ' c
10:49:28.872991 run-command.c:663 trace: run_command: 'C:\git-sdk-64\mingw64\bin\busybox.exe' --help
git: 'frotz' ist kein Git-Befehl. Siehe 'git --help'.

sed delivers 2 lines back. increase the recognition string

@rimrul
Copy link
Member

rimrul commented Jun 2, 2020

@dscho and I had some prior discussion about this issue in the comments of #2495. I think we shouldn't look for busybox commands that start with git-, dscho seemed to favour a config option that controls wether we use busybox.

Your approach of filtering more strictly certainly narrows down what this test does to be closer to it's original intention, though.

@jglathe
Copy link
Author

jglathe commented Jun 2, 2020

I just wanted the test to work and not crap out on aditional trace information, whatever that is. The sed command aims for the trace of the argument from run_command, so... why not aim for it directly?
The same test works on linux, and it isn't dependent on additional programs.

@dscho
Copy link
Member

dscho commented Jun 2, 2020

I wondered why the CI builds don't fail. After a while I figured it out: busybox.exe is missing when those tests are run, therefore this line is simply not printed.

But yes, I still think that it would be a lot better to turn this into a config option that piggy-backs onto the "very early" config in trace2_initialize().

@jglathe
Copy link
Author

jglathe commented Jun 2, 2020 via email

@dscho
Copy link
Member

dscho commented Jun 3, 2020

What I am trying to say is: I'd rather focus on fixing the underlying issue than on some fix that ignores the actual problem: that line that your patch excludes, that line never should be printed in the first place.

@jglathe
Copy link
Author

jglathe commented Jun 3, 2020 via email

@git-for-windows-ci git-for-windows-ci changed the base branch from master to main June 17, 2020 18:10
For some reason, this test case was indented with 4 spaces instead of 1
horizontal tab. The other test cases in the same test script are fine.

Signed-off-by: Jens Glathe <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
trace on git for windows delivers extra info which makes test
'run-command formats empty args properly' fail:

$ cat actual.raw
10:49:28.858579 exec-cmd.c:237          trace: resolved executable dir: C:/git-sdk-64/mingw64/bin
10:49:28.872991 git.c:702               trace: exec: git-frotz a '' b ' ' c
10:49:28.872991 run-command.c:663       trace: run_command: git-frotz a '' b ' ' c
10:49:28.872991 run-command.c:663       trace: run_command: 'C:\git-sdk-64\mingw64\bin\busybox.exe' --help
git: 'frotz' ist kein Git-Befehl. Siehe 'git --help'.

sed delivers 2 lines back. increase the recognition string

Signed-off-by: Jens Glathe <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho merged commit 326291a into git-for-windows:main Oct 9, 2020
@dscho
Copy link
Member

dscho commented Oct 9, 2020

@jglathe thank you for contributing this fix. I had hoped to get around doing something more concrete about the BusyBox story, but obviously did not find the time. Therefore, I (finally!) admit that it is better to have your patch than no solution for the bug at all. Please accept my apologies for taking so long to come around.

@dscho dscho added this to the Next release milestone Oct 9, 2020
dscho added a commit to dscho/git that referenced this pull request Oct 9, 2020
…xtra_info

t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Oct 9, 2020
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Oct 9, 2020
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Oct 9, 2020
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Oct 9, 2020
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Oct 9, 2020
t/t0014: fix: eliminate additional lines from trace
@jglathe jglathe deleted the jg/t0014_trace_extra_info branch October 10, 2020 17:12
git-for-windows-ci pushed a commit that referenced this pull request Oct 12, 2020
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Oct 12, 2020
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Oct 13, 2020
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Oct 15, 2020
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Oct 15, 2020
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Oct 15, 2020
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Oct 15, 2020
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Oct 15, 2020
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Oct 15, 2020
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Oct 15, 2020
t/t0014: fix: eliminate additional lines from trace
dscho added a commit to dscho/git that referenced this pull request Oct 15, 2020
…xtra_info

t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
t/t0014: fix: eliminate additional lines from trace
@dscho dscho mentioned this pull request Jan 7, 2025
dscho added a commit to dscho/git that referenced this pull request Jan 7, 2025
…xtra_info

t/t0014: fix: eliminate additional lines from trace
dscho added a commit to dscho/git that referenced this pull request Jan 7, 2025
…xtra_info

t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Jan 7, 2025
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Jan 8, 2025
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Jan 9, 2025
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Jan 9, 2025
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Jan 17, 2025
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Jan 27, 2025
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Jan 27, 2025
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Jan 27, 2025
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Jan 27, 2025
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Jan 27, 2025
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Jan 28, 2025
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Jan 28, 2025
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Feb 3, 2025
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Feb 5, 2025
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Feb 5, 2025
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Feb 5, 2025
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Feb 5, 2025
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Feb 6, 2025
t/t0014: fix: eliminate additional lines from trace
dscho added a commit that referenced this pull request Feb 6, 2025
t/t0014: fix: eliminate additional lines from trace
git-for-windows-ci pushed a commit that referenced this pull request Feb 6, 2025
t/t0014: fix: eliminate additional lines from trace
dscho added a commit to dscho/git that referenced this pull request Feb 6, 2025
…xtra_info

t/t0014: fix: eliminate additional lines from trace
dscho added a commit to dscho/git that referenced this pull request Feb 6, 2025
…xtra_info

t/t0014: fix: eliminate additional lines from trace
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants