Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent/lib/src/gallery.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class GalleryTransitionTest extends Task {
String deviceId = await getUnlockedDeviceId(ios: ios);
Directory galleryDirectory = dir('${config.flutterDirectory.path}/examples/flutter_gallery');
await inDirectory(galleryDirectory, () async {
await pub('get');
await flutter('packages', options: ['get']);

if (ios) {
// This causes an Xcode project to be created.
Expand Down
6 changes: 3 additions & 3 deletions agent/lib/src/perf_tests.dart
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class StartupTest extends Task {
Future<TaskResultData> run() async {
return await inDirectory(testDirectory, () async {
String deviceId = await getUnlockedDeviceId(ios: ios);
await pub('get');
await flutter('packages', options: ['get']);

if (ios) {
// This causes an Xcode project to be created.
Expand Down Expand Up @@ -93,7 +93,7 @@ class PerfTest extends Task {
Future<TaskResultData> run() {
return inDirectory(testDirectory, () async {
String deviceId = await getUnlockedDeviceId(ios: ios);
await pub('get');
await flutter('packages', options: ['get']);

if (ios) {
// This causes an Xcode project to be created.
Expand Down Expand Up @@ -129,7 +129,7 @@ class BuildTest extends Task {
return await inDirectory(testDirectory, () async {
Adb device = await adb();
device.unlock();
await pub('get');
await flutter('packages', options: ['get']);

var watch = new Stopwatch()..start();
await flutter('build', options: [
Expand Down
2 changes: 1 addition & 1 deletion agent/lib/src/size_tests.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class BasicMaterialAppSizeTest extends Task {
throw 'Failed to create sample Flutter app in ${sampleDir.path}';

await inDirectory(sampleDir, () async {
await pub('get');
await flutter('packages', options: ['get']);
await flutter('build', options: ['clean']);
await flutter('build', options: ['apk', '--release']);
apkSizeInBytes = await file('${sampleDir.path}/build/app.apk').length();
Expand Down
7 changes: 0 additions & 7 deletions agent/lib/src/utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,6 @@ String get dartBin => path.join(config.flutterDirectory.path, 'bin/cache/dart-sd

Future<int> dart(List<String> args) => exec(dartBin, args);

Future<int> pub(String command) {
return exec(
path.join(config.flutterDirectory.path, 'bin/cache/dart-sdk/bin/pub'),
[command]
);
}

Future<dynamic> inDirectory(dynamic directory, Future<dynamic> action()) async {
String previousCwd = cwd;
try {
Expand Down