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

Unified Diff: pkg/analysis_server/test/integration/integration_tests.dart

Issue 423143002: Remove package root hack from the analysis server integration testing (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 5 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
« no previous file with comments | « no previous file | pkg/pkg.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/test/integration/integration_tests.dart
===================================================================
--- pkg/analysis_server/test/integration/integration_tests.dart (revision 38664)
+++ pkg/analysis_server/test/integration/integration_tests.dart (working copy)
@@ -511,24 +511,11 @@
String scriptDir = dirname(Platform.script.path);
String serverPath = normalize(join(scriptDir, '..', '..', 'bin',
'server.dart'));
- String repoPath = normalize(join(scriptDir, '..', '..', '..', '..'));
- String buildDirName;
- if (Platform.isWindows) {
- buildDirName = 'build';
- } else if (Platform.isMacOS) {
- buildDirName = 'xcodebuild';
- } else {
- buildDirName = 'out';
- }
- // TODO(paulberry): this is a guess
- String dartConfiguration = 'ReleaseIA32';
- String buildPath = join(repoPath, buildDirName, dartConfiguration);
- String packageRoot = join(buildPath, 'packages');
List<String> arguments = [];
if (debugServer) {
arguments.add('--debug');
}
- arguments.add('--package-root=$packageRoot');
+ arguments.add('--package-root=${Platform.packageRoot}');
arguments.add(serverPath);
return Process.start(dartBinary, arguments).then((Process process) {
Server server = new Server._(process);
« no previous file with comments | « no previous file | pkg/pkg.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698