diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-03-01 15:37:17 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-02 14:51:09 -0800 |
| commit | 2f3f1de16debdff284792367245d5ba0e9310b35 (patch) | |
| tree | 9b7d94f6e2dd82aead8f85565f64313849227b72 /tools/run_tests/tests.sh | |
| parent | 38bc15552de259fa99c8e9654bed0ff8433902eb (diff) | |
| download | protobuf-2f3f1de16debdff284792367245d5ba0e9310b35.tar.gz protobuf-2f3f1de16debdff284792367245d5ba0e9310b35.tar.bz2 protobuf-2f3f1de16debdff284792367245d5ba0e9310b35.zip | |
Make Java copy into separate directories so the tests can run concurrently.
Diffstat (limited to 'tools/run_tests/tests.sh')
| -rwxr-xr-x | tools/run_tests/tests.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/run_tests/tests.sh b/tools/run_tests/tests.sh index 623cf96c..4b2aef77 100755 --- a/tools/run_tests/tests.sh +++ b/tools/run_tests/tests.sh @@ -112,18 +112,22 @@ use_java() { MVN="mvn --batch-mode" build_java() { + version=$1 + dir=java_$version # Java build needs `protoc`. internal_build_cpp - cd java && $MVN test && $MVN install - cd util && $MVN test + cp -r java $dir + cd $dir && $MVN clean && $MVN test 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() { # Java build needs `protoc`. internal_build_cpp cd java && $MVN test && $MVN install - cd util && $MVN test && $MVN assembly:single + cd util && $MVN package assembly:single cd ../.. cd conformance && make test_java && cd .. } @@ -136,7 +140,7 @@ build_javanano() { build_java_jdk6() { use_java jdk6 - build_java + build_java jdk6 } build_java_jdk7() { use_java jdk7 @@ -144,7 +148,7 @@ build_java_jdk7() { } build_java_oracle7() { use_java oracle7 - build_java + build_java oracle7 } build_javanano_jdk6() { |