| Index: tools/testing/dart/test_suite.dart
|
| diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
|
| index dbab65e1c78a852fc644d343c99b60348b16f732..848463873a94929347d6939346e168ad8f2d4427 100644
|
| --- a/tools/testing/dart/test_suite.dart
|
| +++ b/tools/testing/dart/test_suite.dart
|
| @@ -2219,7 +2219,12 @@ class TestUtils {
|
|
|
| static void ensureExists(String filename, Map configuration) {
|
| if (!configuration['list'] && !existsCache.doesFileExist(filename)) {
|
| + try {
|
| throw "'$filename' does not exist";
|
| + }catch (e,s) {
|
| + print(s);
|
| + rethrow;
|
| + }
|
| }
|
| }
|
|
|
| @@ -2233,12 +2238,14 @@ class TestUtils {
|
| static String outputDir(Map configuration) {
|
| var result = '';
|
| var system = configuration['system'];
|
| - if (system == 'linux') {
|
| + if (system == 'linux' || system == 'android') {
|
| result = 'out/';
|
| } else if (system == 'macos') {
|
| result = 'xcodebuild/';
|
| } else if (system == 'windows') {
|
| result = 'build/';
|
| + } else {
|
| + throw new Exception('Unknown operating system: "$system"');
|
| }
|
| return result;
|
| }
|
| @@ -2335,9 +2342,22 @@ class TestUtils {
|
| default:
|
| throw 'Unrecognized mode configuration: ${configuration['mode']}';
|
| }
|
| + var os;
|
| + switch (configuration['system']) {
|
| + case 'android':
|
| + os = 'Android';
|
| + break;
|
| + case 'linux':
|
| + case 'macos':
|
| + case 'windows':
|
| + os = '';
|
| + break;
|
| + default:
|
| + throw 'Unrecognized operating system: ${configuration['system']}';
|
| + }
|
| var arch = configuration['arch'].toUpperCase();
|
| - var normal = '$mode$arch';
|
| - var cross = '${mode}X$arch';
|
| + var normal = '$mode$os$arch';
|
| + var cross = '$mode${os}X$arch';
|
| var outDir = outputDir(configuration);
|
| var normalDir = new Directory(new Path('$outDir$normal').toNativePath());
|
| var crossDir = new Directory(new Path('$outDir$cross').toNativePath());
|
|
|