adjust location of URI helper files for spawn_uri tests in the browser.

tools/testing/dart/test_suite.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 948 matching lines @@
       htmlTest.writeStringSync(content);
       htmlTest.closeSync();
 
       // Construct the command(s) that compile all the inputs needed by the
       // browser test. For running Dart in DRT, this will be noop commands.
       List<Command> commands = [];
       if (compiler != 'none') {
         commands.add(_compileCommand(
             dartWrapperFilename, compiledDartWrapperFilename,
             compiler, tempDir, vmOptions, optionsFromFile));
+      }
 
-        // some tests require compiling multiple input scripts.
-        List<String> otherScripts = optionsFromFile['otherScripts'];
-        for (String name in otherScripts) {
-          Path namePath = new Path(name);
+      // some tests require compiling multiple input scripts.
+      List<String> otherScripts = optionsFromFile['otherScripts'];
+      for (String name in otherScripts) {
+        Path namePath = new Path(name);
+        String baseName = namePath.filenameWithoutExtension;
+        Path fromPath = filePath.directoryPath.join(namePath);
+        if (compiler != 'none') {
           assert(namePath.extension == 'dart');
-          String baseName = namePath.filenameWithoutExtension;
-          Path fromPath = filePath.directoryPath.join(namePath);
           commands.add(_compileCommand(
-              fromPath.toNativePath(), '$tempDir/$baseName.js',
+              fromPath.toNativePath(), '$tempDir/../$baseName.js',

[kustermann, 2013/04/11 20:32:44]

We can't do that (i.e. '..'). If multiple tests have 'otherScripts' with the
same name, we can get collisions here.

Instead you could maybe put the html file one level deeper?

               compiler, tempDir, vmOptions, optionsFromFile));
         }
+        // Because of our test server's configuration, browser tests expect
+        // these helper files to be at the top level of the generated_tests
+        // directory (we could modify the tests, but then the same test couldn't
+        // be run both on the command line and in the browser).
+        if (compiler == 'none') {
+          File fromFile = new File.fromPath(fromPath);
+          File toFile = new File('$tempDir/../$baseName.dart');
+          fromFile.openRead().pipe(toFile.openWrite());

[kustermann, 2013/04/11 20:32:44]

This is an asynchronous operation. It could happen that the test file is not
written at the time the test starts. Please use *sync() FileIO for this (as we
do above with 'htmlTest'.

+        }
       }
 
       // Variables for browser multi-tests.
       List<String> subtestNames = info.optionsFromFile['subtestNames'];
       TestCase multitestParentTest;
       int subtestIndex = 0;
       // Construct the command that executes the browser test
       do {
         List<Command> commandSet = new List<Command>.from(commands);
         if (subtestIndex != 0) {
@@ skipping 947 matching lines @@
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }