run-tests.php: Remove extra env vars in the generated .sh file #18306
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
arnaud-lb
commented
Apr 15, 2025
| @@ -2723,8 +2723,12 @@ function run_test(string $php, $file, array $env): string | |||
| if (!$passed || $leaked) { | |||
| // write .sh | |||
| if (strpos($log_format, 'S') !== false) { | |||
| $env_lines = []; | |||
| $env_lines = ['unset $(env | cut -d= -f1)']; | |||
There was a problem hiding this comment.
This removes any additional variable that may have been inherited from the parent process.
There was a problem hiding this comment.
maybe your github.com comment should be a comment in the source for this magic sauce :)
Comment on lines
+2728
to
+2731
| if (strval($env_val) === '') { | ||
| // proc_open does not pass empty env vars | ||
| continue; | ||
| } |
There was a problem hiding this comment.
proc_open does not pass empty env vars, so if we export empty env vars here, the test will see these vars when running with the .sh file, but not when running it via run-tests.php.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
run-tests.phpconveniently generates a.shfile for each failed test.The file starts by setting environment variables to the value they had during the test run.
Unfortunately, sometimes extra env vars will sneak in and prevent reproduction:
.shfile.shfile exports empty variables, butproc_open()does notgdb, the variablesLINESandCOLUMNSare setHere I ensure that these variables do not sneak in anymore in these cases when using the
.shfile.