Minor improvements to package selection in test-my-pr/donate-cpu (#3754)

This commit is contained in:
Rikard Falkeborn 2022-01-26 11:36:58 +01:00 committed by GitHub
parent 40147c1e4b
commit d105f3b05f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions

View File

@ -15,7 +15,7 @@ import shlex
# Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/ # Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/
# Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic # Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic
# changes) # changes)
CLIENT_VERSION = "1.3.18" CLIENT_VERSION = "1.3.19"
# Timeout for analysis with Cppcheck in seconds # Timeout for analysis with Cppcheck in seconds
CPPCHECK_TIMEOUT = 30 * 60 CPPCHECK_TIMEOUT = 30 * 60
@ -223,7 +223,7 @@ def download_package(work_path, package, bandwidth_limit):
return destfile return destfile
def unpack_package(work_path, tgz): def unpack_package(work_path, tgz, cpp_only=False):
print('Unpacking..') print('Unpacking..')
temp_path = work_path + '/temp' temp_path = work_path + '/temp'
remove_tree(temp_path) remove_tree(temp_path)
@ -232,14 +232,19 @@ def unpack_package(work_path, tgz):
if tarfile.is_tarfile(tgz): if tarfile.is_tarfile(tgz):
with tarfile.open(tgz) as tf: with tarfile.open(tgz) as tf:
for member in tf: for member in tf:
header_endings = ('.hpp', '.h++', '.hxx', '.hh', '.h')
source_endings = ('.cpp', '.c++', '.cxx', '.cc', '.tpp', '.txx', '.ipp', '.ixx', '.qml')
c_source_endings = ('.c',)
if not cpp_only:
source_endings = source_endings + c_source_endings
if member.name.startswith(('/', '..')): if member.name.startswith(('/', '..')):
# Skip dangerous file names # Skip dangerous file names
continue continue
elif member.name.lower().endswith(('.c', '.cpp', '.cxx', '.cc', '.c++', '.h', '.hpp', elif member.name.lower().endswith(header_endings + source_endings):
'.h++', '.hxx', '.hh', '.tpp', '.txx', '.ipp', '.ixx', '.qml')):
try: try:
tf.extract(member.name, temp_path) tf.extract(member.name, temp_path)
found = True if member.name.lower().endswith(source_endings):
found = True
except OSError: except OSError:
pass pass
except AttributeError: except AttributeError:

View File

@ -25,6 +25,7 @@ if __name__ == "__main__":
group.add_argument('-p', default=256, type=int, help='Count of packages to check') group.add_argument('-p', default=256, type=int, help='Count of packages to check')
group.add_argument('--packages', nargs='+', help='Check specific packages and then stop.') group.add_argument('--packages', nargs='+', help='Check specific packages and then stop.')
parser.add_argument('-o', default='my_check_diff.log', help='Filename of result inside a working path dir') parser.add_argument('-o', default='my_check_diff.log', help='Filename of result inside a working path dir')
parser.add_argument('--cpp-only', dest='cpp_only', help='Only process c++ packages', action='store_true')
parser.add_argument('--work-path', '--work-path=', default=lib.work_path, type=str, help='Working directory for reference repo') parser.add_argument('--work-path', '--work-path=', default=lib.work_path, type=str, help='Working directory for reference repo')
args = parser.parse_args() args = parser.parse_args()
@ -117,7 +118,7 @@ if __name__ == "__main__":
print("No package downloaded") print("No package downloaded")
continue continue
if not lib.unpack_package(work_path, tgz): if not lib.unpack_package(work_path, tgz, args.cpp_only):
print("No files to process") print("No files to process")
continue continue