diff --git a/infra/command/format b/infra/command/format index 67bb3876d43..2e8338cf486 100644 --- a/infra/command/format +++ b/infra/command/format @@ -3,7 +3,6 @@ INVALID_EXIT=0 FILES_TO_CHECK=() DIRECTORIES_TO_BE_TESTED=() -DIRECTORIES_NOT_TO_BE_TESTED=() DEFAULT_CLANG_VERSION="16" CLANG_FORMAT_CANDIDATE=clang-format-$DEFAULT_CLANG_VERSION PATCH_FILE=format.patch @@ -124,16 +123,9 @@ function check_cpp_files() { # Check c++ files: replace ' ' with newline, check with grep FILES_TO_CHECK_CPP=`echo "$FILES_TO_CHECK" | tr ' ' '\n' | egrep '((\.c[cl]?)|(\.cpp)|(\.h(pp)?))$'` - # Manually ignore style checking - FILES_TO_CHECK_CPP=`echo "$FILES_TO_CHECK_CPP" | egrep -v '((/NeuralNetworks\.h)|(/NeuralNetworksExtensions\.h))$'` # Transform to array FILES_TO_CHECK_CPP=($FILES_TO_CHECK_CPP) - # Skip by '.FORMATDENY' file - for s in ${DIRECTORIES_NOT_TO_BE_TESTED[@]}; do - FILES_TO_CHECK_CPP=(${FILES_TO_CHECK_CPP[*]/$s*/}) - done - if [[ ${#FILES_TO_CHECK_CPP} -ne 0 ]]; then ${CLANG_FORMAT} -i ${FILES_TO_CHECK_CPP[@]} EXIT_CODE=$? @@ -210,10 +202,6 @@ if [[ "${CHECK_DIFF_ONLY}" = "1" ]]; then fi fi -for DIR_NOT_TO_BE_TESTED in $(git ls-files -co --exclude-standard '*/.FORMATDENY'); do - DIRECTORIES_NOT_TO_BE_TESTED+=($(dirname "${DIR_NOT_TO_BE_TESTED}")) -done - check_newline check_permission check_cpp_files