Index: utils/compiler/buildbot.py |
=================================================================== |
--- utils/compiler/buildbot.py (revision 10567) |
+++ utils/compiler/buildbot.py (working copy) |
@@ -4,9 +4,9 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
-"""Dart frog buildbot steps |
+"""Dart2js buildbot steps |
-Runs tests for the frog or dart2js compiler. |
+Runs tests for the dart2js compiler. |
""" |
import platform |
@@ -24,8 +24,6 @@ |
DART2JS_BUILDER = ( |
r'dart2js-(linux|mac|windows)-(debug|release)(-([a-z]+))?-?(\d*)-?(\d*)') |
-FROG_BUILDER = ( |
- r'(frog)-(linux|mac|windows)-(debug|release)') |
WEB_BUILDER = ( |
r'web-(ie|ff|safari|chrome|opera)-(win7|win8|mac|linux)-?(\d*)-?(\d*)') |
@@ -34,7 +32,7 @@ |
def GetBuildInfo(): |
"""Returns a tuple (compiler, runtime, mode, system, option) where: |
- - compiler: 'dart2js', 'frog', or None when the builder has an |
+ - compiler: 'dart2js' or None when the builder has an |
kasperl
2012/08/14 07:05:44
Does the "- compiler" comment fit on one line now?
ricow1
2012/08/14 07:41:14
Yes
|
incorrect name |
- runtime: 'd8', 'ie', 'ff', 'safari', 'chrome', 'opera' |
- mode: 'debug' or 'release' |
@@ -66,7 +64,6 @@ |
if builder_name: |
dart2js_pattern = re.match(DART2JS_BUILDER, builder_name) |
- frog_pattern = re.match(FROG_BUILDER, builder_name) |
web_pattern = re.match(WEB_BUILDER, builder_name) |
if dart2js_pattern: |
@@ -78,12 +75,6 @@ |
shard_index = dart2js_pattern.group(5) |
total_shards = dart2js_pattern.group(6) |
- elif frog_pattern: |
- compiler = frog_pattern.group(1) |
- runtime = 'd8' |
- system = frog_pattern.group(2) |
- mode = frog_pattern.group(3) |
- |
elif web_pattern: |
compiler = 'dart2js' |
runtime = web_pattern.group(1) |
@@ -159,7 +150,6 @@ |
for arch in ['ia32', 'x64']: |
outdir = build + arch |
shutil.rmtree(outdir, ignore_errors=True) |
- shutil.rmtree('frog/%s' % outdir, ignore_errors=True) |
shutil.rmtree('runtime/%s' % outdir, ignore_errors=True) |
os.chdir(DART_PATH) |
@@ -172,7 +162,7 @@ |
def TestCompiler(compiler, runtime, mode, system, option, flags, is_buildbot): |
kasperl
2012/08/14 07:05:44
Could we get rid of the compiler parameter?
ricow1
2012/08/14 07:41:14
done
|
""" test the compiler. |
Args: |
- - compiler: either 'dart2js' or 'frog' |
+ - compiler: 'dart2js' |
- runtime: either 'd8', or one of the browsers, see GetBuildInfo |
- mode: either 'debug' or 'release' |
- system: either 'linux', 'mac', or 'win7' |
@@ -182,7 +172,7 @@ |
emulating one. |
""" |
- # Make sure we are in the frog directory |
+ # Make sure we are in the dart directory |
os.chdir(DART_PATH) |
if system.startswith('win') and runtime == 'ie': |
@@ -267,11 +257,6 @@ |
TestStep("dart2js_extra", mode, system, 'dart2js', runtime, extras, |
flags) |
- elif compiler == 'frog': |
- TestStep("frog", mode, system, compiler, runtime, [], flags) |
- extras = ['frog', 'dart2js_native', 'peg', 'css'] |
- TestStep("frog_extra", mode, system, compiler, runtime, extras, flags) |
- |
return 0 |
def _DeleteFirefoxProfiles(directory): |