Allow test.dart dartc/junit_tests to be run from the compiler subdirectory.

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 778 matching lines @@
       new Timer((timerUnused){ doDone(); }, 0);
       return;
     }
     RegExp pattern = configuration['selectors']['dartc'];
     if (!pattern.hasMatch('junit_tests')) {
       new Timer((timerUnused){ doDone(); }, 0);
       return;
     }
 
     dartDir = new File('.').fullPathSync();
+    if (dartDir.endsWith('compiler')) {
+      dartDir = new File('..').fullPathSync();
+      if (!new File('$dartDir/tools/test.dart').existsSync()) {
+        throw new Exception('Cannot find client checkout $dartDir');
+      }
+    }
     buildDir = TestUtils.buildDir(configuration);
     computeClassPath();
     testClasses = <String>[];
     // Do not read the status file.
     // All exclusions are hardcoded in this script, as they are in testcfg.py.
     processDirectory();
   }
 
   void processDirectory() {
     directoryPath = getDirname(directoryPath);
@@ skipping 14 matching lines @@
     if (index != -1) {
       String testRelativePath =
           filename.substring(index + 'compiler/javatests/'.length,
                              filename.length - '.java'.length);
       String testClass = testRelativePath.replaceAll('/', '.');
       testClasses.add(testClass);
     }
   }
 
   void createTest(successIgnored) {
-    String d8 = '$dartDir/$buildDir/d8${TestUtils.executableSuffix}';
+    String d8 = '$buildDir/d8${TestUtils.executableSuffix}';

[Anders Johnsen, 2012/01/12 14:31:26]

Is buildDir absolute since we can do without dartDir?

[Bill Hesse, 2012/01/12 14:45:03]

No, buildDir is relative to the current directory, not relative to dartDir, so
we must use it as a relative path.

     List<String> args = <String>[
         '-ea',
         '-classpath', classPath,
         '-Dcom.google.dart.runner.d8=$d8',
         '-Dcom.google.dart.corelib.SharedTests.test_py=$dartDir/tools/test.py',
         'org.junit.runner.JUnitCore'];
     args.addAll(testClasses);
 
     doTest(new TestCase(suiteName,
                         'java',
                         args,
                         configuration,
                         completeHandler,
                         new Set<String>.from([PASS])));
     doDone();
   }
 
   void completeHandler(TestCase testCase) {
   }
 
   void computeClassPath() {
     classPath = Strings.join(
         ['$buildDir/compiler/lib/dartc.jar',
          '$buildDir/compiler/lib/corelib.jar',
          '$buildDir/compiler-tests.jar',
          '$buildDir/closure_out/compiler.jar',
          // Third party libraries.
-         'third_party/args4j/2.0.12/args4j-2.0.12.jar',
-         'third_party/guava/r09/guava-r09.jar',
-         'third_party/json/r2_20080312/json.jar',
-         'third_party/rhino/1_7R3/js.jar',
-         'third_party/hamcrest/v1_3/hamcrest-core-1.3.0RC2.jar',
-         'third_party/hamcrest/v1_3/hamcrest-generator-1.3.0RC2.jar',
-         'third_party/hamcrest/v1_3/hamcrest-integration-1.3.0RC2.jar',
-         'third_party/hamcrest/v1_3/hamcrest-library-1.3.0RC2.jar',
-         'third_party/junit/v4_8_2/junit.jar'],
+         '$dartDir/third_party/args4j/2.0.12/args4j-2.0.12.jar',
+         '$dartDir/third_party/guava/r09/guava-r09.jar',
+         '$dartDir/third_party/json/r2_20080312/json.jar',
+         '$dartDir/third_party/rhino/1_7R3/js.jar',
+         '$dartDir/third_party/hamcrest/v1_3/hamcrest-core-1.3.0RC2.jar',
+         '$dartDir/third_party/hamcrest/v1_3/hamcrest-generator-1.3.0RC2.jar',
+         '$dartDir/third_party/hamcrest/v1_3/hamcrest-integration-1.3.0RC2.jar',
+         '$dartDir/third_party/hamcrest/v1_3/hamcrest-library-1.3.0RC2.jar',
+         '$dartDir/third_party/junit/v4_8_2/junit.jar'],
         ':');  // Path separator.
   }
 }
 
 
 class TestUtils {
   static String get executableSuffix() =>
       (new Platform().operatingSystem() == 'windows') ? '.exe' : '';
 
   static String executableName(Map configuration) {
@@ skipping 129 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);
   }
 }