Skip to content

Commit 13fb8c1

Browse files
athomascommit-bot@chromium.org
authored andcommitted
Reland "[test] Add paths to chrome and firefox to the environment when present"
This is a reland of 40c79c8 The build recipes now use forward slashes on Windows to pass the path to the browser executable to test.py. 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]> Change-Id: Ib61b8c6424fa7bce525d76d8b94756a215d28c1e Cq-Include-Trybots: dart/try:dart2js-strong-win-x64-chrome-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153980 Commit-Queue: Alexander Thomas <[email protected]> Commit-Queue: William Hesse <[email protected]> Auto-Submit: Alexander Thomas <[email protected]> Reviewed-by: William Hesse <[email protected]>
1 parent 66cb8a8 commit 13fb8c1

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

pkg/test_runner/lib/src/test_suite.dart

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,16 @@ 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(),
5867
};
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-
}
6668
}
6769

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

0 commit comments

Comments
 (0)