Skip to content

Commit

Permalink
[fuchsia] Permit relative entries to the fuchsia_tester (flutter#28821)
Browse files Browse the repository at this point in the history
This change permits
(1) a relative --flutter-shell
(2) relative (source, dill) entries within the test JSON file

and enables portability in the invocation scripts produced by fuchsia's
dart test GN template.
  • Loading branch information
joshuaseaton authored and zanderso committed Mar 4, 2019
1 parent cb704df commit 1ffd5f0
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions packages/flutter_tools/bin/fuchsia_tester.dart
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Future<void> run(List<String> args) async {
try {
Cache.flutterRoot = tempDir.path;

final String shellPath = argResults[_kOptionShell];
final String shellPath = fs.file(argResults[_kOptionShell]).resolveSymbolicLinksSync();
if (!fs.isFileSync(shellPath)) {
throwToolExit('Cannot find Flutter shell at $shellPath');
}
Expand Down Expand Up @@ -128,7 +128,9 @@ Future<void> run(List<String> args) async {
final List<Map<String, dynamic>> jsonList = List<Map<String, dynamic>>.from(
json.decode(fs.file(argResults[_kOptionTests]).readAsStringSync()));
for (Map<String, dynamic> map in jsonList) {
tests[map['source']] = map['dill'];
final String source = fs.file(map['source']).resolveSymbolicLinksSync();
final String dill = fs.file(map['dill']).resolveSymbolicLinksSync();
tests[source] = dill;
}

exitCode = await runTests(
Expand Down

0 comments on commit 1ffd5f0

Please sign in to comment.