diff options
| -rw-r--r-- | jack-tests/tests/com/android/jack/classpath/ClasspathTests.java | 12 | ||||
| -rw-r--r-- | jack/src/com/android/jack/incremental/CommonFilter.java | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java index 19d7c91..16e9340 100644 --- a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java +++ b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java @@ -20,6 +20,7 @@ import com.android.jack.Jack; import com.android.jack.JackAbortException; import com.android.jack.library.FileType; import com.android.jack.library.LibraryReadingException; +import com.android.jack.test.category.KnownBugs; import com.android.jack.test.toolchain.AbstractTestTools; import com.android.jack.test.toolchain.IToolchain; import com.android.jack.test.toolchain.JackApiToolchainBase; @@ -31,6 +32,7 @@ import junit.framework.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.ByteArrayOutputStream; import java.io.File; @@ -205,9 +207,13 @@ public class ClasspathTests { public void testInvalidClasspathEntry() throws Exception { File srcDir = AbstractTestTools.getTestRootDir("com.android.jack.classpath.test004.jack"); compileWithInvalidClasspathEntry(srcDir, new File(srcDir, "Classpath004.java")); - //STOPSHIP: fix this? It does not fail anymore as expected because we now allow Jars, but since - // the Jack library is invalid we should probably report something to the user. -// compileWithInvalidClasspathEntry(srcDir, new File(srcDir, "invalid.jack")); + } + + @Test + @Category(KnownBugs.class) + public void testInvalidJackLibraryInClasspath() throws Exception { + File srcDir = AbstractTestTools.getTestRootDir("com.android.jack.classpath.test004.jack"); + compileWithInvalidClasspathEntry(srcDir, new File(srcDir, "invalid.jack")); } private void compileWithInvalidClasspathEntry(File srcDir, File invalidJack) throws IOException, diff --git a/jack/src/com/android/jack/incremental/CommonFilter.java b/jack/src/com/android/jack/incremental/CommonFilter.java index 54cdd79..381f6e3 100644 --- a/jack/src/com/android/jack/incremental/CommonFilter.java +++ b/jack/src/com/android/jack/incremental/CommonFilter.java @@ -208,7 +208,6 @@ public abstract class CommonFilter { if (library instanceof InputJackLibrary) { libraries.add(library); } else if (library instanceof InvalidLibrary) { - // STOPSHIP: rework reporting of InvalidLibrary, the following code is pretty bad... // let's find why this library is invalid Exception exception = null; try { |