| Index: tools/testing/dart/test_suite.dart
|
| diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
|
| index e02cffb3c19e6ff7b43d74226576a330723f0bcb..4ce22876a794b9810b0cef74071cecb56fa10c11 100644
|
| --- a/tools/testing/dart/test_suite.dart
|
| +++ b/tools/testing/dart/test_suite.dart
|
| @@ -1503,6 +1503,9 @@ class TestUtils {
|
| * [base] directory if that [relativePath] does not already exist.
|
| */
|
| static Directory mkdirRecursive(Path base, Path relativePath) {
|
| + if (relativePath.isAbsolute) {
|
| + base = new Path('/');
|
| + }
|
| Directory dir = new Directory.fromPath(base);
|
| Expect.isTrue(dir.existsSync(),
|
| "Expected ${dir} to already exist");
|
| @@ -1545,19 +1548,6 @@ class TestUtils {
|
| }
|
| }
|
|
|
| - static String outputDir(Map configuration) {
|
| - var result = '';
|
| - var system = configuration['system'];
|
| - if (system == 'linux') {
|
| - result = 'out/';
|
| - } else if (system == 'macos') {
|
| - result = 'xcodebuild/';
|
| - } else if (system == 'windows') {
|
| - result = 'build/';
|
| - }
|
| - return result;
|
| - }
|
| -
|
| static Path dartDir() {
|
| File scriptFile = new File(testScriptPath);
|
| Path scriptPath = new Path.fromNative(scriptFile.fullPathSync());
|
| @@ -1608,9 +1598,21 @@ class TestUtils {
|
| const ['d8', 'jsshell'].contains(runtime);
|
|
|
| static String buildDir(Map configuration) {
|
| + if (configuration['build_directory'] != '') {
|
| + return configuration['build_directory'];
|
| + }
|
| + var outputDir = '';
|
| + var system = configuration['system'];
|
| + if (system == 'linux') {
|
| + outputDir = 'out/';
|
| + } else if (system == 'macos') {
|
| + outputDir = 'xcodebuild/';
|
| + } else if (system == 'windows') {
|
| + outputDir = 'build/';
|
| + }
|
| var mode = (configuration['mode'] == 'debug') ? 'Debug' : 'Release';
|
| var arch = configuration['arch'].toUpperCase();
|
| - return "${TestUtils.outputDir(configuration)}$mode$arch";
|
| + return "$outputDir$mode$arch";
|
| }
|
| }
|
|
|
|
|