Revert "Make Dart heap size bigger when running pub."

Reverts commit r29866.

BUG=

Review URL: https://codereview.chromium.org//58513005

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@29869 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
rnystrom@google.com 2013-11-05 01:49:27 +00:00
parent 2d28ff106c
commit 21963801ae
3 changed files with 6 additions and 19 deletions

View file

@ -12,16 +12,12 @@
BIN_DIR="$(cd "${0%/*}" ; pwd -P)"
SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)"
# Increase the heap size for Dart. Pub runs dart2js, which uses a lot of
# memory.
DART_FLAGS="--new_gen_heap_size=256 --old_gen_heap_size=1536"
SNAPSHOT="$BIN_DIR/snapshots/pub.dart.snapshot"
if test -f "$SNAPSHOT"; then
# We are running the snapshot in the built SDK.
DART="$BIN_DIR/dart"
exec "$DART" "$DART_FLAGS" "$SNAPSHOT" "$@"
exec "$DART" "$SNAPSHOT" "$@"
else
# We are running pub from source in the development repo.
if [ -z "$DART_CONFIGURATION" ];
@ -43,5 +39,5 @@ else
PUB="$SDK_DIR/lib/_internal/pub/bin/pub.dart"
exec "$DART" "$DART_FLAGS" "--package-root=$PACKAGES_DIR" "$PUB" "$@"
exec "$DART" "--package-root=$PACKAGES_DIR" "$PUB" "$@"
fi

View file

@ -12,16 +12,12 @@
BIN_DIR="$(cd "${0%/*}" ; pwd -P)"
SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)"
# Increase the heap size for Dart. Pub runs dart2js, which uses a lot of
# memory.
DART_FLAGS="--new_gen_heap_size=256 --old_gen_heap_size=1536"
SNAPSHOT="$BIN_DIR/snapshots/pub.dart.snapshot"
if test -f "$SNAPSHOT"; then
# We are running the snapshot in the built SDK.
DART="$BIN_DIR/dart"
exec "$DART" "$DART_FLAGS" --checked "$SNAPSHOT" "$@"
exec "$DART" --checked "$SNAPSHOT" "$@"
else
# We are running pub from source in the development repo.
if [ -z "$DART_CONFIGURATION" ];
@ -43,6 +39,5 @@ else
PUB="$SDK_DIR/lib/_internal/pub/bin/pub.dart"
exec "$DART" "$DART_FLAGS" "--checked" "--package-root=$PACKAGES_DIR" "$PUB" \
"$@"
exec "$DART" "--checked" "--package-root=$PACKAGES_DIR" "$PUB" "$@"
fi

View file

@ -472,12 +472,8 @@ ScheduledProcess startPub({List args, Future<Uri> tokenEndpoint}) {
// Find the main pub entrypoint.
var pubPath = path.join(testDirectory, '..', 'bin', 'pub.dart');
var dartArgs = [
'--package-root=$_packageRoot/',
// Make the heap bigger since dart2js uses a lot of memory.
'--new_gen_heap_size=256', '--old_gen_heap_size=1536',
'--checked', pubPath, '--verbose'
];
var dartArgs = ['--package-root=$_packageRoot/', '--checked', pubPath,
'--verbose'];
dartArgs.addAll(args);
if (tokenEndpoint == null) tokenEndpoint = new Future.value();