Selenium / Dartium cleanup

- Set client.status
- Enable executable path to be passed into test.dart (needed for dartium bots to invoke)

Review URL: https://chromiumcodereview.appspot.com//10034002

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@6387 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
vsm@google.com 2012-04-10 22:25:38 +00:00
parent 9442cddcb8
commit 78ea52b486
3 changed files with 27 additions and 3 deletions

View file

@ -5,7 +5,7 @@
dom/WebGL1Test: Skip # Issue 1495
dom/CallbacksTest: Pass, Fail # webkitRequestAnimationFrame now takes one argument.
[ $compiler == none && $runtime == drt ]
[ $compiler == none && ($runtime == drt || $runtime == dartium) ]
# TODO(vsm): Triage DOM tests.
dom/IndexedDB1Test: Fail # IDBDatabaseImplementation._transaction "Not supported yet'.
dom/NativeGCTest: Fail # Issue 1448.
@ -23,9 +23,11 @@ dom/DOMIsolatesTest: Fail
dom/HTMLElementTest: Fail
dom/WindowOpenTest: Fail
[ $runtime == dartium || $runtime == chrome || $runtime == ie || $runtime == safari || $runtime == ff || $runtime == opera ]
dom/HistoryTest: Fail
[ $runtime == chrome || $runtime == ie || $runtime == safari || $runtime == ff || $runtime == opera ]
dom/ImplementationTest: Fail
dom/HistoryTest: Fail
html/html_tests: Pass, Fail # "Measurement measurement is async but before" See issue 1946.
[ $runtime == safari || $runtime == ie ]

View file

@ -415,6 +415,14 @@ is 'dart file.dart' and you specify special command
print("Error: shard index is ${config['shard']} out of " +
"${config['shards']} shards");
}
if (config['runtime'] == 'dartium' && config['compiler'] == 'none' &&
config['checked']) {
// TODO(vsm): Set the DART_FLAGS environment appropriately when
// invoking Selenium to support checked mode. It's not clear
// the current selenium API supports this.
isValid = false;
print("Warning: checked mode is not yet supported for dartium tests.");
}
return isValid;
}

View file

@ -616,6 +616,9 @@ class StandardTestSuite implements TestSuite {
'--browser=$runtime',
'--timeout=${configuration["timeout"] - 2}',
'--out=$htmlPath'];
if (runtime == 'dartium') {
args.add('--executable=$dartiumFilename');
}
} else {
args = [
'$dartDir/tools/testing/drt-trampoline.py',
@ -775,12 +778,23 @@ class StandardTestSuite implements TestSuite {
return configuration['drt'];
}
if (new Platform().operatingSystem() == 'macos') {
return '$dartDir/client/tests/drt/DumpRenderTree.app/Contents/' +
return '$dartDir/client/tests/drt/DumpRenderTree.app/Contents/'
'MacOS/DumpRenderTree';
}
return '$dartDir/client/tests/drt/DumpRenderTree';
}
String get dartiumFilename() {
if (configuration['dartium'] != '') {
return configuration['dartium'];
}
if (new Platform().operatingSystem() == 'macos') {
return '$dartDir/client/tests/dartium/Chromium.app/Contents/'
'MacOS/Chromium';
}
return '$dartDir/client/tests/dartium/chrome';
}
void testGeneratorStarted() {
++activeTestGenerators;
}