Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(289)

Unified Diff: sdk/lib/_internal/pub_generated/test/global/binstubs/binstub_runs_executable_test.dart

Issue 657673002: Regenerate pub sources. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sdk/lib/_internal/pub_generated/test/global/binstubs/binstub_runs_executable_test.dart
diff --git a/sdk/lib/_internal/pub_generated/test/global/binstubs/binstub_runs_executable_test.dart b/sdk/lib/_internal/pub_generated/test/global/binstubs/binstub_runs_executable_test.dart
index c0a86bce224d6bc1bc318504612de0bd5e32dee7..5bb8e86c28f589e53e16cbae12c4fbcc30b90d94 100644
--- a/sdk/lib/_internal/pub_generated/test/global/binstubs/binstub_runs_executable_test.dart
+++ b/sdk/lib/_internal/pub_generated/test/global/binstubs/binstub_runs_executable_test.dart
@@ -1,10 +1,17 @@
+// Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
import 'dart:io';
+
import 'package:path/path.dart' as p;
import 'package:scheduled_test/scheduled_process.dart';
import 'package:scheduled_test/scheduled_test.dart';
+
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
import 'utils.dart';
+
main() {
initConfig();
integration("the generated binstub runs a snapshotted executable", () {
@@ -17,14 +24,18 @@ main() {
contents: [
d.dir("bin", [d.file("script.dart", "main(args) => print('ok \$args');")])]);
});
+
schedulePub(args: ["global", "activate", "foo"]);
+
var process = new ScheduledProcess.start(
p.join(sandboxDir, cachePath, "bin", binStubName("foo-script")),
["arg1", "arg2"],
environment: getEnvironment());
+
process.stdout.expect("ok [arg1, arg2]");
process.shouldExit();
});
+
integration("the generated binstub runs a non-snapshotted executable", () {
d.dir("foo", [d.pubspec({
"name": "foo",
@@ -35,19 +46,27 @@ main() {
d.dir(
"bin",
[d.file("script.dart", "main(args) => print('ok \$args');")])]).create();
+
schedulePub(args: ["global", "activate", "-spath", "../foo"]);
+
var process = new ScheduledProcess.start(
p.join(sandboxDir, cachePath, "bin", binStubName("foo-script")),
["arg1", "arg2"],
environment: getEnvironment());
+
process.stdout.expect("ok [arg1, arg2]");
process.shouldExit();
});
}
+
+/// The buildbots do not have the Dart SDK (containing "dart" and "pub") on
+/// their PATH, so we need to spawn the binstub process with a PATH that
+/// explicitly includes it.
getEnvironment() {
var binDir = p.dirname(Platform.executable);
var separator = Platform.operatingSystem == "windows" ? ";" : ":";
var path = "${Platform.environment["PATH"]}$separator$binDir";
+
var environment = getPubTestEnvironment();
environment["PATH"] = path;
return environment;

Powered by Google App Engine
This is Rietveld 408576698