Revert "Removes dartc reliance on its own libraries, now can be targeted at any implementation's li…

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 977 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) {
-    var sdkDir = "$buildDir/dart-sdk".trim();
+    String d8 =
+        "$buildDir/d8${TestUtils.executableSuffix(configuration['component'])}";
     List<String> args = <String>[
         '-ea',
         '-classpath', classPath,
-        '-Dcom.google.dart.sdk=$sdkDir',
+        '-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,
                         [new Command('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.
          '$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.
   }
 }
 
@@ skipping 191 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);
    }
 }