Rename the name of the new analyzer jar file from new_analyzer.jar to

dartanalyzer.jar (which I think will be the preferred name for it in
the SDK).

Update the test framework for these renames.
Review URL: https://codereview.chromium.org//12618010

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@20994 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
devoncarew@google.com 2013-04-05 19:33:23 +00:00
parent 755c71f1fc
commit c5c15b0881
4 changed files with 15 additions and 15 deletions

View file

@ -31,11 +31,11 @@ fi
if [[ `uname` == 'Darwin' ]];
then
JAR_DIR="$CUR_DIR"/../../xcodebuild/$DART_CONFIGURATION/new_analyzer
JAR_DIR="$CUR_DIR"/../../xcodebuild/$DART_CONFIGURATION/dartanalyzer
else
JAR_DIR="$CUR_DIR"/../../out/$DART_CONFIGURATION/new_analyzer
JAR_DIR="$CUR_DIR"/../../out/$DART_CONFIGURATION/dartanalyzer
fi
JAR_FILE="$JAR_DIR/new_analyzer.jar"
JAR_FILE="$JAR_DIR/dartanalyzer.jar"
exec java -jar $JAR_FILE --dart-sdk "$SDK_DIR" "$@"

View file

@ -20,8 +20,8 @@ set arguments=%*
set "SDK_DIR=%SCRIPTPATH%\..\..\build\%DART_CONFIGURATION%\dart-sdk"
set "JAR_DIR=%SCRIPTPATH%\..\..\build\%DART_CONFIGURATION%\new_analyzer"
set "JAR_DIR=%SCRIPTPATH%\..\..\build\%DART_CONFIGURATION%\dartanalyzer"
set "JAR_FILE=%JAR_DIR%\new_analyzer.jar"
set "JAR_FILE=%JAR_DIR%\dartanalyzer.jar"
java -jar %JAR_FILE% --dart-sdk %SDK_DIR% %arguments%

View file

@ -79,10 +79,10 @@ is 'dart file.dart' and you specify special command
dartc: Perform static analysis on Dart code by running dartc.
(only valid with the following runtimes: none),
new_analyzer: Perform static analysis on Dart code by running the analyzer.
dartanalyzer: Perform static analysis on Dart code by running the analyzer.
(only valid with the following runtimes: none)''',
['-c', '--compiler'],
['none', 'dart2dart', 'dart2js', 'dartc', 'new_analyzer'],
['none', 'dart2dart', 'dart2js', 'dartc', 'dartanalyzer'],
'none'),
new _TestOptionSpecification(
'runtime',
@ -442,7 +442,7 @@ Note: currently only implemented for dart2js.''',
'opera'];
break;
case 'dartc':
case 'new_analyzer':
case 'dartanalyzer':
validRuntimes = const ['none'];
break;
case 'none':
@ -591,7 +591,7 @@ Note: currently only implemented for dart2js.''',
var timeout = 60;
switch (configuration['compiler']) {
case 'dartc':
case 'new_analyzer':
case 'dartanalyzer':
timeout *= 4;
break;
case 'dart2js':

View file

@ -140,7 +140,7 @@ abstract class TestSuite {
var name;
switch (configuration['compiler']) {
case 'dartc':
case 'new_analyzer':
case 'dartanalyzer':
name = executablePath;
break;
case 'dart2js':
@ -181,8 +181,8 @@ abstract class TestSuite {
return '$buildDir/dart$suffix';
case 'dartc':
return '$buildDir/analyzer/bin/dart_analyzer$suffix';
case 'new_analyzer':
return 'sdk/bin/analyzer$suffix';
case 'dartanalyzer':
return 'sdk/bin/dartanalyzer$suffix';
default:
throw "Unknown executable for: ${configuration['compiler']}";
}
@ -781,7 +781,7 @@ class StandardTestSuite extends TestSuite {
case 'none':
case 'dartc':
case 'new_analyzer':
case 'dartanalyzer':
var arguments = new List.from(vmOptions);
arguments.addAll(args);
return <Command>[new Command(dartShellFileName, arguments)];
@ -1148,7 +1148,7 @@ class StandardTestSuite extends TestSuite {
case 'dart2dart':
return 'application/dart';
case 'dart2js':
case 'new_analyzer':
case 'dartanalyzer':
case 'dartc':
return 'text/javascript';
default:
@ -1832,7 +1832,7 @@ class TestUtils {
const ['d8', 'jsshell'].contains(runtime);
static bool isCommandLineAnalyzer(String compiler) =>
compiler == 'dartc' || compiler == 'new_analyzer';
compiler == 'dartc' || compiler == 'dartanalyzer';
static String buildDir(Map configuration) {
// FIXME(kustermann,ricow): Our code assumes that the returned 'buildDir'