Skip to content

Commit b7b3ade

Browse files
authored
Remove bazel-diff and bazel-differ comparison tests (#106)
These were useful while we were bootstrapping the project, but we are not updating these any more, and we are unlikely to change the behaviour of Target Determinator if an update causes some of these comparison tests to fail. For both of these reasons, it makes sense to remove the tests.
1 parent a7ea46e commit b7b3ade

File tree

4 files changed

+1
-544
lines changed

4 files changed

+1
-544
lines changed

WORKSPACE

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@ load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
2929

3030
gazelle_dependencies()
3131

32-
# Pull in bazel_diff for testing.
33-
http_file(
34-
name = "bazel_diff",
35-
downloaded_file_path = "bazel-diff_deploy.jar",
36-
sha256 = "5f36e74a8d6167e4d31f663526a63be3e3728456d8b5b4a84503315dd10e65e7",
37-
url = "https://github.com/Tinder/bazel-diff/releases/download/9.0.0/bazel-diff_deploy.jar",
38-
)
39-
4032
RULES_JVM_EXTERNAL_TAG = "6.7"
4133

4234
RULES_JVM_EXTERNAL_SHA = "a1e351607f04fed296ba33c4977d3fe2a615ed50df7896676b67aac993c53c18"
@@ -109,35 +101,3 @@ load("//:third_party/go/deps.bzl", "go_dependencies")
109101

110102
# gazelle:repository_macro third_party/go/deps.bzl%go_dependencies
111103
go_dependencies()
112-
113-
##########################################################
114-
# bazel-differ: https://github.com/ewhauser/bazel-differ #
115-
##########################################################
116-
117-
http_file(
118-
name = "bazel_differ_linux_arm64",
119-
executable = True,
120-
integrity = "sha256-eFjQ2D6auwcnycoY67qOx6NJPsI2ZKSUv1cPdaBVtOo=",
121-
url = "https://github.com/ewhauser/bazel-differ/releases/download/v0.0.7/bazel-differ-linux-arm64",
122-
)
123-
124-
http_file(
125-
name = "bazel_differ_linux_x86_64",
126-
executable = True,
127-
integrity = "sha256-quwSTcr6dHF0Jh7JyCR74zMsItHRcS7YD7YSAClp5CA=",
128-
url = "https://github.com/ewhauser/bazel-differ/releases/download/v0.0.7/bazel-differ-linux-x86_64",
129-
)
130-
131-
http_file(
132-
name = "bazel_differ_darwin_arm64",
133-
executable = True,
134-
integrity = "sha256-0dbJKJXHzTr0/43nJxFO+xGbCPiGYEqVirve25SXss4=",
135-
url = "https://github.com/ewhauser/bazel-differ/releases/download/v0.0.7/bazel-differ-darwin-arm64",
136-
)
137-
138-
http_file(
139-
name = "bazel_differ_darwin_x86_64",
140-
executable = True,
141-
integrity = "sha256-wS/sbX/XgsIaX51VUOGyv7wRzKkmOUgLHzx+wg2weVE=",
142-
url = "https://github.com/ewhauser/bazel-differ/releases/download/v0.0.7/bazel-differ-darwin-x86_64",
143-
)
Lines changed: 1 addition & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,6 @@
11
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
22
load("@rules_jvm_external//:defs.bzl", "artifact")
33

4-
java_test(
5-
name = "BazelDiffIntegrationTest",
6-
timeout = "long",
7-
srcs = [
8-
"BazelDiffIntegrationTest.java",
9-
],
10-
data = [":bazel-diff"],
11-
env_inherit = ["CC"],
12-
tags = ["no-sandbox"],
13-
deps = [
14-
":tests",
15-
":util",
16-
artifact("com.google.guava:guava"),
17-
artifact("com.google.code.findbugs:jsr305"),
18-
artifact("junit:junit"),
19-
"//tests/integration/java/com/github/bazel_contrib/target_determinator/label",
20-
"@bazel_tools//tools/java/runfiles",
21-
],
22-
)
23-
24-
java_import(
25-
name = "raw-bazel-diff-deploy-jar",
26-
jars = [
27-
"@bazel_diff//file",
28-
],
29-
)
30-
31-
java_binary(
32-
name = "bazel-diff",
33-
main_class = "com.bazel_diff.Main",
34-
runtime_deps = [":raw-bazel-diff-deploy-jar"],
35-
)
36-
37-
java_test(
38-
name = "BazelDifferIntegrationTest",
39-
timeout = "long",
40-
srcs = [
41-
"BazelDifferIntegrationTest.java",
42-
],
43-
data = [":bazel-differ-binary"],
44-
env_inherit = [
45-
"CC",
46-
"PATH",
47-
],
48-
jvm_flags = [
49-
"-Dbazel_differ=$(rootpath :bazel-differ-binary)",
50-
],
51-
tags = ["no-sandbox"],
52-
deps = [
53-
":tests",
54-
":util",
55-
artifact("com.google.guava:guava"),
56-
artifact("com.google.code.findbugs:jsr305"),
57-
artifact("junit:junit"),
58-
"//tests/integration/java/com/github/bazel_contrib/target_determinator/label",
59-
],
60-
)
61-
624
java_test(
635
name = "TargetDeterminatorIntegrationTest",
646
timeout = "long",
@@ -70,7 +12,7 @@ java_test(
7012
jvm_flags = [
7113
"-Dtarget_determinator=$(rootpath //target-determinator)",
7214
],
73-
shard_count = 3,
15+
shard_count = 5,
7416
tags = ["no-sandbox"],
7517
deps = [
7618
":tests",
@@ -135,19 +77,3 @@ java_library(
13577
artifact("org.hamcrest:hamcrest-all"),
13678
],
13779
)
138-
139-
copy_file(
140-
name = "bazel-differ-binary",
141-
src = ":original-bazel-differ",
142-
out = "bazel-differ",
143-
)
144-
145-
alias(
146-
name = "original-bazel-differ",
147-
actual = select({
148-
"//:linux_arm64": "@bazel_differ_linux_arm64//file",
149-
"//:linux_x86_64": "@bazel_differ_linux_x86_64//file",
150-
"//:macos_arm64": "@bazel_differ_darwin_arm64//file",
151-
"//:macos_x86_64": "@bazel_differ_darwin_x86_64//file",
152-
}),
153-
)

tests/integration/java/com/github/bazel_contrib/target_determinator/integration/BazelDiffIntegrationTest.java

Lines changed: 0 additions & 182 deletions
This file was deleted.

0 commit comments

Comments
 (0)