Basic merge with v_B14a for 3.7M2
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
index 114475a..46366ee 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
@@ -1149,6 +1149,7 @@
// test directory preparation
true /* flush output directory */,
testFiles /* test files */,
+ new String[] {},
// compiler options
null /* no class libraries */,
null /* no custom options */,
@@ -1190,25 +1191,26 @@
// javac options
JavacTestOptions.DEFAULT /* default javac test options */);
}
-
- // WORK good candidate for elimination (3 uses)
protected void runConformTest(
- String[] testFiles,
- String expectedSuccessOutputString,
- String[] vmArguments) {
+ String[] testFiles,
+ String[] dependantFiles,
+ String expectedSuccessOutputString) {
runTest(
- testFiles /* test files */,
- false /* expecting no compiler errors */,
- null /* do not check compiler log */,
- expectedSuccessOutputString /* expected output string */,
- null /* do not check error string */,
- false /* do not force execution */,
- null /* no class libraries */,
- true /* flush output directory */,
- vmArguments /* vm arguments */,
- null /* no custom options */,
- null /* no custom requestor */,
- JavacTestOptions.DEFAULT /* default javac test options */);
+ true,
+ testFiles,
+ dependantFiles,
+ null,
+ null,
+ false,
+ null,
+ false,
+ null,
+ false,
+ null,
+ expectedSuccessOutputString,
+ null,
+ null,
+ JavacTestOptions.DEFAULT);
}
protected void runConformTest(
@@ -2075,8 +2077,10 @@
String expectedErrorString,
// javac options
JavacTestOptions javacTestOptions) {
- runTest(shouldFlushOutputDirectory,
+ runTest(
+ shouldFlushOutputDirectory,
testFiles,
+ new String[] {},
classLibraries,
customOptions,
performStatementsRecovery,
@@ -2166,6 +2170,7 @@
// test directory preparation
boolean shouldFlushOutputDirectory,
String[] testFiles,
+ String[] dependantFiles,
// compiler options
String[] classLibraries,
Map customOptions,
@@ -2209,7 +2214,7 @@
CompilerOptions compilerOptions = new CompilerOptions(options);
compilerOptions.performMethodsFullRecovery = performStatementsRecovery;
compilerOptions.performStatementsRecovery = performStatementsRecovery;
- INameEnvironment nameEnvironment = getNameEnvironment(new String[]{}, classLibraries);
+ INameEnvironment nameEnvironment = getNameEnvironment(dependantFiles, classLibraries);
Compiler batchCompiler =
new Compiler(
nameEnvironment,