Skip to content

Commit 23d94ae

Browse files
azymnisjohnynek
authored andcommitted
Fix test regression due to multi service manifest change (#276)
* Add dependency on singlejar * Use singlejar to build deployable scala binaries * Only append main class if the attribute exists * Normalize singlejar * Add a test for multiple service manifests * Fix test regression due to multi service manifest merge * Fix call to hash function
1 parent fe265a2 commit 23d94ae

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

test/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,4 +432,3 @@ scala_binary(
432432
main_class = "scala.test.BinaryDependentOnJava",
433433
deps = [":JavaOnlySources"],
434434
)
435-

test_run.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,16 @@ fi
2525
echo "$_md5_util"
2626
}
2727

28+
non_deploy_jar_md5_sum() {
29+
find bazel-bin/test -name "*.jar" ! -name "*_deploy.jar" | $(md5_util)
30+
}
31+
2832
test_build_is_identical() {
2933
bazel build test/...
30-
$(md5_util) bazel-bin/test/*.jar > hash1
34+
non_deploy_jar_md5_sum > hash1
3135
bazel clean
3236
bazel build test/...
33-
$(md5_util) bazel-bin/test/*.jar > hash2
37+
non_deploy_jar_md5_sum > hash2
3438
diff hash1 hash2
3539
}
3640

@@ -201,6 +205,9 @@ test_multi_service_manifest() {
201205
bazel build test:$deploy_jar
202206
unzip -p bazel-bin/test/$deploy_jar $meta_file > service_manifest.txt
203207
diff service_manifest.txt test/example_jars/expected_service_manifest.txt
208+
RESPONSE_CODE=$?
209+
rm service_manifest.txt
210+
exit $RESPONSE_CODE
204211
}
205212

206213
NC='\033[0m'

0 commit comments

Comments
 (0)