Skip to content

Commit 2b5eaff

Browse files
athomascommit-bot@chromium.org
authored andcommitted
Revert "[test] Add paths to chrome and firefox to the environment when present"
This reverts commit 40c79c8. Reason for revert: Breaks on windows. Original change's description: > [test] Add paths to chrome and firefox to the environment when present > > This adds a CHROME_PATH or FIREFOX_PATH environment variable to the > test's evnironment which contains a path to the browser's executable. > This is only set if the --chrome or --firefox argument was passed to > test.py. > > #42417 > > Change-Id: I711de6ab91b8ffbbe72c7fb1530b68c4189a4b8a > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153209 > Commit-Queue: Alexander Thomas <[email protected]> > Reviewed-by: William Hesse <[email protected]> [email protected],[email protected] Change-Id: I7e1351f9b170ae3ddd218055efb770fe6e1f54e8 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153606 Reviewed-by: Alexander Thomas <[email protected]> Commit-Queue: Alexander Thomas <[email protected]>
1 parent fcbf534 commit 2b5eaff

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

pkg/test_runner/lib/src/test_suite.dart

+7-9
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,14 @@ abstract class TestSuite {
5555
TestSuite(this.configuration, this.suiteName, this.statusFilePaths) {
5656
_environmentOverrides = {
5757
'DART_CONFIGURATION': configuration.configurationDirectory,
58-
if (Platform.isWindows) 'DART_SUPPRESS_WER': '1',
59-
if (Platform.isWindows && configuration.copyCoreDumps)
60-
'DART_CRASHPAD_HANDLER':
61-
Uri.base.resolve(buildDir + '/crashpad_handler.exe').toFilePath(),
62-
if (configuration.chromePath != null)
63-
'CHROME_PATH': Uri.base.resolve(configuration.chromePath).toFilePath(),
64-
if (configuration.firefoxPath != null)
65-
'FIREFOX_PATH':
66-
Uri.base.resolve(configuration.firefoxPath).toFilePath(),
6758
};
59+
if (Platform.isWindows) {
60+
_environmentOverrides['DART_SUPPRESS_WER'] = '1';
61+
if (configuration.copyCoreDumps) {
62+
_environmentOverrides['DART_CRASHPAD_HANDLER'] =
63+
Path(buildDir + '/crashpad_handler.exe').absolute.toNativePath();
64+
}
65+
}
6866
}
6967

7068
Map<String, String> get environmentOverrides => _environmentOverrides;

0 commit comments

Comments
 (0)