diff --git a/.travis.yml b/.travis.yml index c93a12c41d3f7cd1597e2450913962b0de4d7ea8..432221099194caa3579fe44c2e77cbeaee108e93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_script: - cp scripts/AGREEMENT.txt ${HOME}/.cache/.apollo_agreement.txt script: - ./docker/scripts/dev_start.sh dev-x86_64-20170919_1658-ci - - ./apollo_docker.sh ${JOB} + - ./apollo_docker.sh ${JOB} --jobs=10 - rm -rf "${HOME}/.cache/bazel/_bazel_${USER}/install" notifications: email: diff --git a/apollo.sh b/apollo.sh index 081bcca8aa9161b4a45bb423e5a3d3bec4590b9b..d837b9c03f9053ee00fb83a7163b932e6f8b8eea 100755 --- a/apollo.sh +++ b/apollo.sh @@ -257,7 +257,7 @@ function release() { function gen_coverage() { bazel clean generate_build_targets - echo "$BUILD_TARGETS" | grep -v "cnn_segmentation_test" | xargs bazel test $DEFINES -c dbg --config=coverage + echo "$BUILD_TARGETS" | grep -v "cnn_segmentation_test" | xargs bazel test $DEFINES -c dbg --config=coverage $@ if [ $? -ne 0 ]; then fail 'run test failed!' fi @@ -299,9 +299,9 @@ function run_test() { generate_build_targets if [ "$USE_GPU" == "1" ]; then echo -e "${RED}Need GPU to run the tests.${NO_COLOR}" - echo "$BUILD_TARGETS" | xargs bazel test $DEFINES --config=unit_test -c dbg --test_verbose_timeout_warnings + echo "$BUILD_TARGETS" | xargs bazel test $DEFINES --config=unit_test -c dbg --test_verbose_timeout_warnings $@ else - echo "$BUILD_TARGETS" | grep -v "cnn_segmentation_test" | xargs bazel test $DEFINES --config=unit_test -c dbg --test_verbose_timeout_warnings + echo "$BUILD_TARGETS" | grep -v "cnn_segmentation_test" | xargs bazel test $DEFINES --config=unit_test -c dbg --test_verbose_timeout_warnings $@ fi if [ $? -eq 0 ]; then success 'Test passed!' @@ -538,12 +538,12 @@ function main() { ;; test) DEFINES="${DEFINES} --cxxopt=-DCPU_ONLY" - run_test + run_test $@ ;; test_gpu) DEFINES="${DEFINES} --cxxopt=-DUSE_CAFFE_GPU" USE_GPU="1" - run_test + run_test $@ ;; release) release 1 @@ -552,7 +552,7 @@ function main() { release 0 ;; coverage) - gen_coverage + gen_coverage $@ ;; clean) clean diff --git a/apollo_docker.sh b/apollo_docker.sh index e47c6573c467642a69d496d223ae905320c87884..244fc793f8e2a70940447102bd2c2bad1d2645cd 100755 --- a/apollo_docker.sh +++ b/apollo_docker.sh @@ -86,7 +86,7 @@ function push() { docker push "$RELEASE_NAME" } -if [ $# != 1 ];then +if [ $# == 0 ];then print_usage exit 1 fi @@ -104,6 +104,6 @@ case $1 in gen_docker ;; *) - docker exec -u $USER apollo_dev bash -c "./apollo.sh $1" + docker exec -u $USER apollo_dev bash -c "./apollo.sh $@" ;; esac