aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test
diff options
context:
space:
mode:
authorGravatar gregce <gregce@google.com>2017-09-11 21:50:09 +0200
committerGravatar Philipp Wollermann <philwo@google.com>2017-09-12 14:05:24 +0200
commitd24f3cbfc0b3102aaf550a282f26bc9c1ba073bf (patch)
tree712990998d077e9b6e31b7779e86d5c24094937e /src/test
parent4c4ce713c57d6b8850f6966be66567da194e4c25 (diff)
Remove outdated defaultsToSelf.
Part of the static config cleanup effort. PiperOrigin-RevId: 168270713
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/ConfigurationsForLateBoundTargetsTest.java5
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java7
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/TestConfigFragments.java6
-rw-r--r--src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java5
-rw-r--r--src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithDynamicConfigurationsTest.java35
5 files changed, 1 insertions, 57 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/ConfigurationsForLateBoundTargetsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/ConfigurationsForLateBoundTargetsTest.java
index 3fc5127667..7112ba6dfa 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/ConfigurationsForLateBoundTargetsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/ConfigurationsForLateBoundTargetsTest.java
@@ -57,11 +57,6 @@ public class ConfigurationsForLateBoundTargetsTest extends AnalysisTestCase {
toOptions.get(LateBoundSplitUtil.TestOptions.class).fooFlag = "PATCHED!";
return toOptions;
}
-
- @Override
- public boolean defaultsToSelf() {
- return false;
- }
};
/**
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java
index edc480354c..36df7a21d5 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java
@@ -67,11 +67,6 @@ public class LateBoundSplitUtil {
split2.get(TestOptions.class).fooFlag = "two";
return ImmutableList.<BuildOptions>of(split1, split2);
}
-
- @Override
- public boolean defaultsToSelf() {
- return false;
- }
};
/**
@@ -155,4 +150,4 @@ public class LateBoundSplitUtil {
static TestOptions getOptions(BuildConfiguration config) {
return config.getOptions().get(TestOptions.class);
}
-} \ No newline at end of file
+}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/TestConfigFragments.java b/src/test/java/com/google/devtools/build/lib/analysis/TestConfigFragments.java
index 1abd0d8683..83920038a6 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/TestConfigFragments.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/TestConfigFragments.java
@@ -41,12 +41,6 @@ public class TestConfigFragments {
}
@Override
- public boolean defaultsToSelf() {
- throw new UnsupportedOperationException(
- "dynamic configurations don't use global transition tables");
- }
-
- @Override
public BuildOptions apply(BuildOptions options) {
BuildOptions toOptions = options.clone();
BuildConfiguration.Options coreOptions =
diff --git a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
index b5d74d7852..70ffa8f573 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
@@ -294,11 +294,6 @@ public class AttributeTest {
private static class TestSplitTransition implements SplitTransition<BuildOptions> {
@Override
- public boolean defaultsToSelf() {
- return true;
- }
-
- @Override
public List<BuildOptions> split(BuildOptions buildOptions) {
return ImmutableList.of(buildOptions.clone(), buildOptions.clone());
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithDynamicConfigurationsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithDynamicConfigurationsTest.java
index 04180a87f8..ed71e45dbb 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithDynamicConfigurationsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithDynamicConfigurationsTest.java
@@ -76,11 +76,6 @@ public class ConfigurationsForTargetsWithDynamicConfigurationsTest
public List<BuildOptions> split(BuildOptions buildOptions) {
return ImmutableList.of();
}
-
- @Override
- public boolean defaultsToSelf() {
- return true;
- }
}
private static class SetsHostCpuSplitTransition implements SplitTransition<BuildOptions> {
@@ -90,11 +85,6 @@ public class ConfigurationsForTargetsWithDynamicConfigurationsTest
result.get(BuildConfiguration.Options.class).hostCpu = "SET BY SPLIT";
return ImmutableList.of(result);
}
-
- @Override
- public boolean defaultsToSelf() {
- return true;
- }
}
private static class SetsCpuSplitTransition implements SplitTransition<BuildOptions> {
@@ -105,11 +95,6 @@ public class ConfigurationsForTargetsWithDynamicConfigurationsTest
result.get(BuildConfiguration.Options.class).cpu = "SET BY SPLIT";
return ImmutableList.of(result);
}
-
- @Override
- public boolean defaultsToSelf() {
- return true;
- }
}
private static class SetsCpuPatchTransition implements PatchTransition {
@@ -120,11 +105,6 @@ public class ConfigurationsForTargetsWithDynamicConfigurationsTest
result.get(BuildConfiguration.Options.class).cpu = "SET BY PATCH";
return result;
}
-
- @Override
- public boolean defaultsToSelf() {
- return true;
- }
}
/** Base rule that depends on the test configuration fragment. */
@@ -224,11 +204,6 @@ public class ConfigurationsForTargetsWithDynamicConfigurationsTest
result.get(TestConfiguration.TestOptions.class).testFilter = "SET BY PATCH FACTORY: " + value;
return result;
}
-
- @Override
- public boolean defaultsToSelf() {
- return true;
- }
}
private static class SetsTestFilterFromAttributeTransitionFactory
@@ -475,11 +450,6 @@ public class ConfigurationsForTargetsWithDynamicConfigurationsTest
baseOptions.testFilter = (nullToEmpty(baseOptions.testFilter)) + value;
return toOptions;
}
-
- @Override
- public boolean defaultsToSelf() {
- return false;
- }
};
}
@@ -503,11 +473,6 @@ public class ConfigurationsForTargetsWithDynamicConfigurationsTest
}
return result.build();
}
-
- @Override
- public boolean defaultsToSelf() {
- return false;
- }
};
}