walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

donate-cpu: fixed #11276 (donate-cpu: Improve library detection) / respect `--no-upload` in "nodata" uploads (#5292) 

We were only matching each library once as the entry was removed from
the container stored in the class as we did not modify a copy but a
reference.
This commit is contained in:
Oliver Stöneberg 2023-08-04 10:30:58 +02:00 committed by GitHub
parent 5ff8955dbe
commit 4aae670b45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/donate-cpu.py
View File

@ -218,9 +218,10 @@ while True:
source_path, source_found = lib.unpack_package(work_path, tgz, skip_files=skip_files) source_path, source_found = lib.unpack_package(work_path, tgz, skip_files=skip_files)
if not source_found: if not source_found:
print("No files to process") print("No files to process")
lib.upload_nodata(package) if do_upload:
print('Sleep 5 seconds..') lib.upload_nodata(package)
time.sleep(5) print('Sleep 5 seconds..')
time.sleep(5)
continue continue
crash = False crash = False
timeout = False timeout = False

6
tools/donate_cpu_lib.py
View File

@ -10,12 +10,13 @@ import re
import signal import signal
import tarfile import tarfile
import shlex import shlex
import copy
# 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.46" CLIENT_VERSION = "1.3.47"
# Timeout for analysis with Cppcheck in seconds # Timeout for analysis with Cppcheck in seconds
CPPCHECK_TIMEOUT = 30 * 60 CPPCHECK_TIMEOUT = 30 * 60
@ -746,7 +747,8 @@ class LibraryIncludes:
print('Detecting library usage...') print('Detecting library usage...')
libraries = ['posix', 'gnu'] libraries = ['posix', 'gnu']
library_includes_re = self.__library_includes_re # explicitly copy as assignments in python are references
library_includes_re = copy.copy(self.__library_includes_re)
def has_include(filedata): def has_include(filedata):
lib_del = [] lib_del = []

14
tools/test_donate_cpu_lib.py
View File

@ -18,8 +18,11 @@
from donate_cpu_lib import * from donate_cpu_lib import *
def _test_library_includes(tmpdir, libs, content): def _test_library_includes(tmpdir, libs, content, libinc_obj=None):
library_includes = LibraryIncludes() if libinc_obj is None:
library_includes = LibraryIncludes()
else:
library_includes = libinc_obj
src_file = os.path.join(str(tmpdir), "file.cpp") src_file = os.path.join(str(tmpdir), "file.cpp")
with open(src_file, 'w') as f: with open(src_file, 'w') as f:
@ -52,3 +55,10 @@ def test_library_includes(tmpdir):
_test_library_includes(tmpdir, ['posix', 'gnu', 'opengl'], '#include\t <GL/glut.h>') _test_library_includes(tmpdir, ['posix', 'gnu', 'opengl'], '#include\t <GL/glut.h>')
_test_library_includes(tmpdir, ['posix', 'gnu', 'nspr'], '#include\t"prtypes.h"') _test_library_includes(tmpdir, ['posix', 'gnu', 'nspr'], '#include\t"prtypes.h"')
_test_library_includes(tmpdir, ['posix', 'gnu', 'lua'], '#include \t<lua.h>') _test_library_includes(tmpdir, ['posix', 'gnu', 'lua'], '#include \t<lua.h>')
def test_match_multiple_time(tmpdir):
libinc = LibraryIncludes()
# there was a bug that we would only match each library once successfully
_test_library_includes(tmpdir, ['posix', 'gnu', 'zlib'], '#include <zlib.h>', libinc)
_test_library_includes(tmpdir, ['posix', 'gnu', 'zlib'], '#include <zlib.h>', libinc)