Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ os:

env:
# we want to test the last release
- V=0.11.1 TEST_SCRIPT=test_rules_scala.sh
- V=0.11.1 TEST_SCRIPT=test_intellij_aspect.sh
- V=0.11.1 TEST_SCRIPT=test_reproducibility.sh
- V=0.12.0 TEST_SCRIPT=test_rules_scala.sh
- V=0.12.0 TEST_SCRIPT=test_intellij_aspect.sh
- V=0.12.0 TEST_SCRIPT=test_reproducibility.sh

before_install:
- |
Expand Down
7 changes: 5 additions & 2 deletions test_rules_scala.sh
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,11 @@ test_scala_library_expect_failure_on_missing_direct_deps_warn_mode() {

test_scala_library_expect_failure_on_missing_direct_java() {
dependency_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency'
#since bazel 0.12.0 the labels are only emmitted if ijar is in play
dependency_file='test_expect_failure/missing_direct_deps/internal_deps/transitive_dependency_ijar.jar'
test_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency_java_user'

expected_message="$dependency_target[ \t]*to[ \t]*$test_target"
expected_message="$dependency_file.*$test_target"

test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message "${expected_message}" $test_target "--strict_java_deps=error"
}
Expand All @@ -169,9 +171,10 @@ test_scala_library_expect_better_failure_message_on_missing_transitive_dependenc

test_scala_library_expect_failure_on_missing_direct_deps_warn_mode_java() {
dependency_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency'
dependency_file='test_expect_failure/missing_direct_deps/internal_deps/transitive_dependency_ijar.jar'
test_target='//test_expect_failure/missing_direct_deps/internal_deps:transitive_dependency_java_user'

local expected_message="buildozer 'add deps $dependency_target ' $test_target"
local expected_message="$dependency_file.*$test_target"

test_expect_failure_or_warning_on_missing_direct_deps_with_expected_message "${expected_message}" ${test_target} "--strict_java_deps=warn" "ne"
}
Expand Down