Index: tools/testing/dart/test_suite.dart |
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart |
index 4d0447275815800715b575d2e178214739be9c54..0d0b49559fb7c49e1c06e07f295e95d1a2f89308 100644 |
--- a/tools/testing/dart/test_suite.dart |
+++ b/tools/testing/dart/test_suite.dart |
@@ -704,7 +704,7 @@ class StandardTestSuite extends TestSuite { |
String tempDir = createOutputDirectory(info.filePath, ''); |
args.add('--out=$tempDir/out.js'); |
- List<Command> commands = |
+ List<Command> commands = |
<Command>[new CompilationCommand("$tempDir/out.js", |
!useDart2JsFromSdk, |
dart2JsBootstrapDependencies, |
@@ -863,11 +863,6 @@ class StandardTestSuite extends TestSuite { |
// Create the HTML file for the test. |
RandomAccessFile htmlTest = new File(htmlPath).openSync(FileMode.WRITE); |
String filePrefix = ''; |
Mads Ager (google)
2013/01/02 10:09:50
Looks like filePrefix can be completely removed?
Emily Fortuna
2013/01/04 00:51:03
Done.
|
- if (Platform.operatingSystem == 'windows') { |
- // Firefox on Windows does not like absolute file path names that start |
- // with 'C:' adding 'file:///' solves the problem. |
- filePrefix = 'file:///'; |
- } |
String content = null; |
Path dir = filePath.directoryPath; |
String nameNoExt = filePath.filenameWithoutExtension; |
@@ -922,17 +917,20 @@ class StandardTestSuite extends TestSuite { |
do { |
List<Command> commandSet = new List<Command>.from(commands); |
if (subtestIndex != 0) { |
- // NOTE: The first time we enter this loop, all the compilation |
- // commands will be executed. On subsequent loop iterations, we |
+ // NOTE: The first time we enter this loop, all the compilation |
+ // commands will be executed. On subsequent loop iterations, we |
// don't need to do any compilations. Thus we set "commandSet = []". |
commandSet = []; |
} |
List<String> args = <String>[]; |
+ var basePath = TestUtils.dartDir().toString(); |
+ htmlPath = htmlPath.startsWith(basePath) ? |
+ htmlPath.substring(basePath.length) : htmlPath; |
String fullHtmlPath = htmlPath.startsWith('http:') ? htmlPath : |
(htmlPath.startsWith('/') ? |
- 'file://$htmlPath' : |
- 'file:///$htmlPath'); |
+ 'http://127.0.0.1:${SERVER_PORT_ONE}$htmlPath' : |
Mads Ager (google)
2013/01/02 10:09:50
Do we now load all browser tests from the test ser
Emily Fortuna
2013/01/04 00:51:03
Done.
|
+ 'http://127.0.0.1:${SERVER_PORT_ONE}/$htmlPath'); |
if (info.optionsFromFile['isMultiHtmlTest'] |
&& subtestNames.length > 0) { |
fullHtmlPath = '${fullHtmlPath}#${subtestNames[subtestIndex]}'; |
@@ -971,7 +969,7 @@ class StandardTestSuite extends TestSuite { |
if (compiler == 'none') { |
var packageRootPath = packageRoot(optionsFromFile['packageRoot']); |
if (packageRootPath != null) { |
- var absolutePath = |
+ var absolutePath = |
TestUtils.absolutePath(new Path(packageRootPath)); |
packageRootUri = new Uri.fromComponents( |
scheme: 'file', |