commit 674ab860b3f2ebee958196d96ffee1702087201b
author brandjon <brandjon@google.com> Fri Oct 06 23:17:33 2017 +0200
committer Klaus Aehlig <aehlig@google.com> Sat Oct 07 11:07:11 2017 +0200
tree 69fac8e2546944930e7d08634b357d9b8f33365a
parent 6fbf7a2948969538b9935887ae6fff7b7c998e65

Move SkylarkSemanticsOptions to the packages/ directory, alongside SkylarkSemanticsCodec

Note that the syntax package and its test package still depend indirectly on the options parser via other Bazel-specific packages.

RELNOTES: None
PiperOrigin-RevId: 171342823

src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
index 3346700..7e297b6 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/IncrementalLoadingTest.java
@@ -32,6 +32,7 @@
 import com.google.devtools.build.lib.packages.NoSuchThingException;
 import com.google.devtools.build.lib.packages.Package;
 import com.google.devtools.build.lib.packages.Rule;
+import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
 import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.packages.util.LoadingMock;
 import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
@@ -40,7 +41,6 @@
 import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker;
 import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
 import com.google.devtools.build.lib.syntax.GlobList;
-import com.google.devtools.build.lib.syntax.SkylarkSemanticsOptions;
 import com.google.devtools.build.lib.testutil.ManualClock;
 import com.google.devtools.build.lib.testutil.TestConstants;
 import com.google.devtools.build.lib.util.Preconditions;
@@ -342,6 +342,7 @@
     tester.sync();
     try {
       tester.getTarget("//e:e");
+      fail("Expected exception");
     } catch (NoSuchPackageException expected) {
     }
     throwOnReaddir = null;