diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh index 69303013d2a41a049276c0d1b03b9d902b555d23..ac6531a2cc55dbe47049797b96349d659adab496 100755 --- a/paddle/scripts/paddle_build.sh +++ b/paddle/scripts/paddle_build.sh @@ -988,6 +988,11 @@ set +x fi read testcase <<< $(echo "$line"|grep -oEi "\w+$") + if python $PADDLE_ROOT/tools/is_ut_disabled.py $testcase; then + echo $testcase" is disabled." + continue + fi + if [[ "$is_nightly" != "" ]] && [ ${NIGHTLY_MODE:-OFF} == "OFF" ]; then echo $testcase" will only run at night." continue diff --git a/tools/check_file_diff_approvals.sh b/tools/check_file_diff_approvals.sh index 84254cc89bb8eef12a95189416cd29cce828f5ca..16e61d7c77a4e86fbb2cdbb9bbc1e82f29322424 100644 --- a/tools/check_file_diff_approvals.sh +++ b/tools/check_file_diff_approvals.sh @@ -286,7 +286,7 @@ fi # Get the list of PR authors with unresolved unit test issues pip install PyGithub # For getting PR related data -wget https://paddle-ci.gz.bcebos.com/blk/block.txt --no-check-certificate +wget https://sys-p0.bj.bcebos.com/blk/block.txt --no-check-certificate wget https://sys-p0.bj.bcebos.com/bk-ci/bk.txt --no-check-certificate HASUTFIXED=`python ${PADDLE_ROOT}/tools/check_ut.py | grep "has unit-test to be fixed" || true` if [ "${HASUTFIXED}" != "" ]; then diff --git a/tools/is_ut_disabled.py b/tools/is_ut_disabled.py new file mode 100644 index 0000000000000000000000000000000000000000..a21fe39e71e516cf14d1eda970d2deba986ef8a3 --- /dev/null +++ b/tools/is_ut_disabled.py @@ -0,0 +1,40 @@ +# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +""" Check whether ut is disabled. """ + +import os +import sys + + +def check_ut(): + """ Get disabled unit tests. """ + disable_ut_file = 'disable_ut' + cmd = 'wget -q --no-check-certificate https://sys-p0.bj.bcebos.com/prec/{}'.format( + disable_ut_file) + os.system(cmd) + with open(disable_ut_file) as utfile: + for u in utfile: + if u.rstrip('\r\n') == sys.argv[1]: + exit(0) + exit(1) + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + try: + check_ut() + except Exception as e: + print(e) + exit(1)