AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Make Java copy into separate directories so the tests can run concurrently.

Browse Source
This commit is contained in:
Josh Haberman 2016-03-01 15:37:17 -08:00
parent 38bc15552d
commit 2f3f1de16d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/run_tests/tests.sh
View File

@ -112,18 +112,22 @@ use_java() {
MVN="mvn --batch-mode" MVN="mvn --batch-mode"
build_java() { build_java() {
version=$1
dir=java_$version
# Java build needs `protoc`. # Java build needs `protoc`.
internal_build_cpp internal_build_cpp
cd java && $MVN test && $MVN install cp -r java $dir
cd util && $MVN test cd $dir && $MVN clean && $MVN test
cd ../.. cd ../..
} }
# The conformance tests are hard-coded to work with the $ROOT/java directory.
# So this can't run in parallel with two different sets of tests.
build_java_with_conformance_tests() { build_java_with_conformance_tests() {
# Java build needs `protoc`. # Java build needs `protoc`.
internal_build_cpp internal_build_cpp
cd java && $MVN test && $MVN install cd java && $MVN test && $MVN install
cd util && $MVN test && $MVN assembly:single cd util && $MVN package assembly:single
cd ../.. cd ../..
cd conformance && make test_java && cd .. cd conformance && make test_java && cd ..
} }
@ -136,7 +140,7 @@ build_javanano() {
build_java_jdk6() { build_java_jdk6() {
use_java jdk6 use_java jdk6
build_java build_java jdk6
} }
build_java_jdk7() { build_java_jdk7() {
use_java jdk7 use_java jdk7
@ -144,7 +148,7 @@ build_java_jdk7() {
} }
build_java_oracle7() { build_java_oracle7() {
use_java oracle7 use_java oracle7
build_java build_java oracle7
} }
build_javanano_jdk6() { build_javanano_jdk6() {