diff --git a/streaming/BUILD.bazel b/streaming/BUILD.bazel index 3ab194701..875a2f913 100644 --- a/streaming/BUILD.bazel +++ b/streaming/BUILD.bazel @@ -306,7 +306,5 @@ cc_binary( deps = [ ":jni", ":streaming_lib", - "//:core_worker_lib", - "//:ray_util", ], ) diff --git a/streaming/java/test.sh b/streaming/java/test.sh index c58f28f88..30c73002e 100755 --- a/streaming/java/test.sh +++ b/streaming/java/test.sh @@ -7,33 +7,37 @@ set -x ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd) -run_testng() { - "$@" || exit_code=$? - # exit_code == 2 means there are skipped tests. - if [ $exit_code -ne 2 ] && [ $exit_code -ne 0 ] ; then - exit $exit_code - fi -} - echo "build ray streaming" bazel build //streaming/java:all +# Check that ray libstreaming_java doesn't include symbols from ray by accident. +# Otherwise the symbols may conflict. +symbols_conflict=$(nm bazel-bin/streaming/libstreaming_java.so | grep TaskFinisherInterface || true) +if [ -n "${symbols_conflict}" ]; then + echo "streaming should not include symbols from ray: ${symbols_conflict}" + exit 1 +fi + echo "Linting Java code with checkstyle." bazel test //streaming/java:all --test_tag_filters="checkstyle" --build_tests_only echo "Running streaming tests." -run_testng java -cp $ROOT_DIR/../../bazel-bin/streaming/java/all_streaming_tests_deploy.jar\ - org.testng.TestNG -d /tmp/ray_streaming_java_test_output $ROOT_DIR/testng.xml - +java -cp "$ROOT_DIR"/../../bazel-bin/streaming/java/all_streaming_tests_deploy.jar\ + org.testng.TestNG -d /tmp/ray_streaming_java_test_output "$ROOT_DIR"/testng.xml +exit_code=$? echo "Streaming TestNG results" cat /tmp/ray_streaming_java_test_output/testng-results.xml +# exit_code == 2 means there are skipped tests. +if [ $exit_code -ne 2 ] && [ $exit_code -ne 0 ] ; then + exit $exit_code +fi echo "Testing maven install." -cd $ROOT_DIR/../../java +cd "$ROOT_DIR"/../../java echo "build ray maven deps" bazel build gen_maven_deps echo "maven install ray" mvn clean install -DskipTests -cd $ROOT_DIR +cd "$ROOT_DIR" echo "maven install ray streaming" mvn clean install -DskipTests