From a66ea4f21b515ee813a751ed3f8e500306fa984d Mon Sep 17 00:00:00 2001 From: gaaclarke <30870216+gaaclarke@users.noreply.github.com> Date: Thu, 26 Sep 2019 17:09:05 -0700 Subject: [PATCH] Devicelab run.dart: Fixed check for path equality (#41403) Fixed check for path equality. It was too strict, disallowing leading "./". --- dev/devicelab/bin/run.dart | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dev/devicelab/bin/run.dart b/dev/devicelab/bin/run.dart index b9f70e69995..8944943d10e 100644 --- a/dev/devicelab/bin/run.dart +++ b/dev/devicelab/bin/run.dart @@ -123,7 +123,7 @@ final ArgParser _argParser = ArgParser() if (fragments.length == 1 && !isDartFile) { // Not a path _taskNames.add(nameOrPath); - } else if (!isDartFile || fragments.length != 3 || !_listsEqual(['bin', 'tasks'], fragments.take(2).toList())) { + } else if (!isDartFile || !path.equals(path.dirname(nameOrPath), path.join('bin', 'tasks'))) { // Unsupported executable location throw FormatException('Invalid value for option -t (--task): $nameOrPath'); } else { @@ -197,15 +197,3 @@ final ArgParser _argParser = ArgParser() } }, ); - -bool _listsEqual(List a, List b) { - if (a.length != b.length) - return false; - - for (int i = 0; i < a.length; i++) { - if (a[i] != b[i]) - return false; - } - - return true; -}