Revert "Make changes to test.dart and frogsh for Windows."

tools/testing/dart/test_suite.dart

 // Copyright (c) 2011, 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.
 
 #library("test_suite");
 
 #import("status_file_parser.dart");
 #import("test_runner.dart");
 #import("multitest.dart");
 
@@ skipping 391 matching lines @@
             domLibraryImport,
             '$dartDir/tests/isolate/src/TestFramework.dart',
             dartLibraryFilename));
         dartWrapper.closeSync();
       } else {
         dartWrapperFilename = testPath;
         // TODO(whesse): Once test.py is retired, adjust the relative path in
         // the client/samples/dartcombat test to its css file, remove the
         // "../../" from this path, and move this out of the isWebTest guard.
         // Also remove getHtmlName, and just use test.html.
-        // TODO(efortuna): this shortening of htmlFilename is a band-aid until 
-        // the above gets fixed. Windows cannot have paths that are longer than
-        // 260 characters, and without this hack, we were running past the
-        // limit.
-        String htmlFilename = getHtmlName(filename);
-        while ('${tempDir.path}/../../$htmlFilename'.length >= 260) {
-          htmlFilename = htmlFilename.substring(htmlFilename.length~/2);
-        }
-        htmlPath = '${tempDir.path}/../../$htmlFilename';
+        htmlPath = '${tempDir.path}/../../${getHtmlName(filename)}';
       }
       final String scriptPath = (component == 'dartium') ?
           dartWrapperFilename : compiledDartWrapperFilename;
       // Create the HTML file for the test.
       RandomAccessFile htmlTest = new File(htmlPath).openSync(FileMode.WRITE);
       htmlTest.writeStringSync(GetHtmlContents(
           filename,
           '$dartDir/client/testing/unittest/test_controller.js',
           scriptType,
           scriptPath));
@@ skipping 13 matching lines @@
           compilerArgs.add(compiledDartWrapperFilename);
           compilerArgs.add(dartWrapperFilename);
           // TODO(whesse): Add --fatal-type-errors if needed.
           break;
         case 'frogium':
         case 'webdriver':
           String libdir = configuration['froglib'];
           if (libdir == '') {
             libdir = '$dartDir/frog/lib';
           }
-          compilerArgs.addAll(['--compile-only',
-                               '--out=$compiledDartWrapperFilename',
-                               '--libdir=$libdir']);
+          compilerArgs.addAll(['--libdir=$libdir',
+                               '--compile-only',
+                               '--out=$compiledDartWrapperFilename']);
           compilerArgs.addAll(vmOptions);
           compilerArgs.add(dartWrapperFilename);
           break;
         case 'dartium':
           // No compilation phase.
           compilerExecutable = null;
           compilerArgs = null;
           break;
         default:
           Expect.fail('unimplemented component $component');
       }
 
       String executable = getFilename(dumpRenderTreeFilename);
       List<String> args;
       if (component == 'webdriver') {
+        // TODO(efortuna): These paths are not OS independent! 
         executable = '$dartDir/tools/testing/run_selenium.py';
-        if (new Platform().operatingSystem() == 'windows') {
-          // For Windows, the first command, must have the Windows 
-          // slash direction.
-          // TODO(efortuna): Get rid of this hack when issue 1306 is fixed.
-          executable = executable.replaceAll('/', '\\');
-        }
-        args = ['--out=$htmlPath', '--browser=${configuration["browser"]}'];
+        args = ['--out', htmlPath, '--browser', configuration['browser']];
       } else {
         args = ['--no-timeout'];
         if (component == 'dartium') {
           var dartFlags = ['--ignore-unrecognized-flags'];
           if (configuration["checked"]) {
             dartFlags.add('--enable_asserts');
             dartFlags.add("--enable_type_checks");
           }
           dartFlags.addAll(vmOptions);
           args.add('--dart-flags=${Strings.join(dartFlags, " ")}');
@@ skipping 423 matching lines @@
           return 'frog/bin/frog$postfix';
       case 'frogsh':
         return 'frog/bin/frogsh$postfix';
       default:
         throw "Unknown executable for: ${configuration['component']}";
     }
   }
 
   static String compilerName(Map configuration) {
     String postfix =
-        ((new Platform().operatingSystem() == 'windows') && 
-        (configuration['component'] != 'frogium' &&
-        configuration['component'] != 'webdriver')) ? '.exe' : '';
+        (new Platform().operatingSystem() == 'windows') ? '.exe' : '';
     switch (configuration['component']) {
       case 'chromium':
       case 'dartc':
         return 'compiler/bin/dartc$postfix';
       case 'frogium':
       case 'webdriver':
-        return 'frog/bin/frogsh';
+        return 'frog/bin/frogsh$postfix';
       default:
         throw "Unknown compiler for: ${configuration['component']}";
     }
   }
 
   static String dartShellFileName(Map configuration) {
     var name = '${buildDir(configuration)}/${executableName(configuration)}';
     if (!(new File(name)).existsSync()) {
       throw "Executable '$name' does not exist";
     }
@@ skipping 108 matching lines @@
  * $noCrash tests are expected to be flaky but not crash
  * $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
 """;
     print(report);
    }
 }