Commit 989dc8ff authored by Campbell Barton's avatar Campbell Barton
Browse files

Merge branch 'master' into temp-header-clean

parents 068ab30a 7c4fafa9
Pipeline #4760 failed with stages
in 21 seconds
{
"project_id" : "Blender Dev Tools",
"conduit_uri" : "https://developer.blender.org/",
"git.default-relative-commit" : "origin/master",
"arc.land.update.default" : "rebase"
}
\ No newline at end of file
#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# Contributor(s): Sergey Sharybin
#
# #**** END GPL LICENSE BLOCK #****
# <pep8 compliant>
import unittest
from check_utils import (sliceCommandLineArguments,
SceiptUnitTesting)
class UnitTesting(SceiptUnitTesting):
def test_modulesEnabled(self):
self.checkScript("modules_enabled")
def main():
# Slice command line arguments by '--'
unittest_args, parser_args = sliceCommandLineArguments()
# Construct and run unit tests.
unittest.main(argv=unittest_args)
if __name__ == "__main__":
main()
#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# Contributor(s): Sergey Sharybin
#
# #**** END GPL LICENSE BLOCK #****
# <pep8 compliant>
import unittest
from check_utils import (sliceCommandLineArguments,
SceiptUnitTesting)
class UnitTesting(SceiptUnitTesting):
def test_numpyImports(self):
self.checkScript("numpy_import")
def test_numpyBasicOperation(self):
self.checkScript("numpy_basic_operation")
def main():
# Slice command line arguments by '--'
unittest_args, parser_args = sliceCommandLineArguments()
# Construct and run unit tests.
unittest.main(argv=unittest_args)
if __name__ == "__main__":
main()
#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# Contributor(s): Sergey Sharybin
#
# #**** END GPL LICENSE BLOCK #****
# <pep8 compliant>
import unittest
from check_utils import (sliceCommandLineArguments,
SceiptUnitTesting)
class UnitTesting(SceiptUnitTesting):
def test_requestsImports(self):
self.checkScript("requests_import")
def test_requestsBasicAccess(self):
self.checkScript("requests_basic_access")
def main():
# Slice command line arguments by '--'
unittest_args, parser_args = sliceCommandLineArguments()
# Construct and run unit tests.
unittest.main(argv=unittest_args)
if __name__ == "__main__":
main()
#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# Contributor(s): Sergey Sharybin
#
# #**** END GPL LICENSE BLOCK #****
# <pep8 compliant>
# Usage: ./check_release.py -- ../path/to/release/folder
import os
import sys
import unittest
import check_module_enabled
import check_module_numpy
import check_module_requests
import check_static_binaries
from check_utils import sliceCommandLineArguments
def load_tests(loader, standard_tests, pattern):
standard_tests.addTests(loader.loadTestsFromTestCase(
check_module_enabled.UnitTesting))
standard_tests.addTests(loader.loadTestsFromTestCase(
check_module_numpy.UnitTesting))
standard_tests.addTests(loader.loadTestsFromTestCase(
check_module_requests.UnitTesting))
standard_tests.addTests(loader.loadTestsFromTestCase(
check_static_binaries.UnitTesting))
return standard_tests
def main():
# Slice command line arguments by '--'
unittest_args, parser_args = sliceCommandLineArguments()
# Construct and run unit tests.
unittest.main(argv=unittest_args)
if __name__ == "__main__":
main()
#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# Contributor(s): Sergey Sharybin
#
# #**** END GPL LICENSE BLOCK #****
# <pep8 compliant>
import os
from pathlib import Path
import re
import subprocess
import sys
import unittest
from check_utils import (sliceCommandLineArguments,
parseArguments)
ALLOWED_LIBS = (
# Core C/C++ libraries
"ld-linux.so",
"ld-linux-x86-64.so",
"libc.so",
"libm.so",
"libstdc++.so",
"libdl.so",
"libpthread.so",
"libgcc_s.so",
"librt.so",
"libutil.so",
# X11 libraries we don't link statically,
"libX11.so",
"libXext.so",
"libXrender.so",
"libXxf86vm.so",
"libXi.so",
# OpenGL libraries.
"libGL.so",
"libGLU.so",
# Own dependencies we don't link statically.
"libfreetype.so",
)
IGNORE_FILES = ("blender-softwaregl", )
IGNORE_EXTENSION = (".sh", ".py", )
# Library dependencies.
def getNeededLibrariesLDD(binary_filepath):
"""
This function uses ldd to collect libraries which binary depends on.
Not totally safe since ldd might actually execute the binary to get it's
symbols and will also collect indirect dependnecies which might not be
desired.
Has advantage of telling that some dependnecy library is not found.
"""
ldd_command = ("ldd", str(binary_filepath))
ldd_output = subprocess.check_output(ldd_command, stderr=subprocess.STDOUT)
lines = ldd_output.decode().split("\n")
libraries = []
for line in lines:
line = line.strip()
if not line:
continue
lib_name = line.split("=>")[0]
lib_name = lib_name.split(" (")[0].strip()
lib_file_name = os.path.basename(lib_name)
libraries.append(lib_file_name)
return libraries
def getNeededLibrariesOBJDUMP(binary_filepath):
"""
This function uses objdump to get direct dependencies of a given binary.
Totally safe, but will require manual check over libraries which are not
found on the system.
"""
objdump_command = ("objdump", "-p", str(binary_filepath))
objdump_output = subprocess.check_output(objdump_command,
stderr=subprocess.STDOUT)
lines = objdump_output.decode().split("\n")
libraries = []
for line in lines:
line = line.strip()
if not line:
continue
if not line.startswith("NEEDED"):
continue
lib_name = line[6:].strip()
libraries.append(lib_name)
return libraries
def getNeededLibraries(binary_filepath):
"""
Get all libraries given binary depends on.
"""
if False:
return getNeededLibrariesLDD(binary_filepath)
else:
return getNeededLibrariesOBJDUMP(binary_filepath)
def stripLibraryABI(lib_name):
"""
Strip ABI suffix from .so file
Example; libexample.so.1.0 => libexample.so
"""
lib_name_no_abi = lib_name
# TOOD(sergey): Optimize this!
while True:
no_abi = re.sub(r"\.[0-9]+$", "", lib_name_no_abi)
if lib_name_no_abi == no_abi:
break
lib_name_no_abi = no_abi
return lib_name_no_abi
class UnitTesting(unittest.TestCase):
def checkBinary(self, binary_filepath):
"""
Check given binary file to be a proper static self-sufficient.
"""
libraries = getNeededLibraries(binary_filepath)
for lib_name in libraries:
lib_name_no_abi = stripLibraryABI(lib_name)
self.assertTrue(lib_name_no_abi in ALLOWED_LIBS,
"Error detected in {}: library used {}" . format(
binary_filepath, lib_name))
def checkDirectory(self, directory):
"""
Recursively traverse directory and check every binary in in.
"""
for path in Path(directory).rglob("*"):
# Ignore any checks on directory.
if path.is_dir():
continue
# Ignore script files.
if path.name in IGNORE_FILES:
continue
if path.suffix in IGNORE_EXTENSION:
continue
# Check any executable binary,
if path.stat().st_mode & 0o111 != 0:
self.checkBinary(path)
# Check all dynamic libraries.
elif path.suffix == ".so":
self.checkBinary(path)
def test_directoryIsStatic(self):
# Parse arguments which are not handled by unit testing framework.
args = parseArguments()
# Do some sanity checks first.
self.assertTrue(os.path.exists(args.directory),
"Given directory does not exist: {}" .
format(args.directory))
self.assertTrue(os.path.isdir(args.directory),
"Given path is not a directory: {}" .
format(args.directory))
# Perform actual test,
self.checkDirectory(args.directory)
def main():
# Slice command line arguments by '--'
unittest_args, parser_args = sliceCommandLineArguments()
# Construct and run unit tests.
unittest.main(argv=unittest_args)
if __name__ == "__main__":
main()
#!/usr/bin/env python3
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# Contributor(s): Sergey Sharybin
#
# #**** END GPL LICENSE BLOCK #****
# <pep8 compliant>
import unittest
def sliceCommandLineArguments():
"""
Slice command line arguments by -- argument.
"""
import sys
try:
double_shasl_index = sys.argv.index("--")
except ValueError:
unittest_args = sys.argv[:]
parser_args = []
else:
unittest_args = sys.argv[:double_shasl_index]
parser_args = sys.argv[double_shasl_index + 1:]
return unittest_args, parser_args
def parseArguments():
import argparse
# Construct argument parser.
parser = argparse.ArgumentParser(description="Static binary checker")
parser.add_argument('directory', help='Directories to check')
# Parse arguments which are not handled by unit testing framework.
unittest_args, parser_args = sliceCommandLineArguments()
args = parser.parse_args(args=parser_args)
# TODO(sergey): Run some checks here?
return args
def runScriptInBlender(blender_directory, script):
"""
Run given script inside Blender and check non-zero exit code
"""
import os
import subprocess
blender = os.path.join(blender_directory, "blender")
python = os.path.join(os.path.dirname(__file__), "scripts", script) + ".py"
command = (blender,
"-b",
"--factory-startup",
"--python-exit-code", "1",
"--python", python)
process = subprocess.Popen(command,
shell=False,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
output, error = process.communicate()
return process.returncode == 0
class SceiptUnitTesting(unittest.TestCase):
def checkScript(self, script):
# Parse arguments which are not handled by unit testing framework.
args = parseArguments()
# Perform actual test,
self.assertTrue(runScriptInBlender(args.directory, script),
"Failed to run script {}" . format(script))
import _sha1
import _sha256
import _md5
import ssl
import multiprocessing.synchronize
# This code tests bug reported in T50703
import numpy
a = numpy.array([[3, 2, 0], [3, 1, 0]], dtype=numpy.int32)
a[0]
import requests
r = requests.get("https://blender.org/", verify=True)
assert(r.status_code == 200)
assert(r.reason == "OK")
assert(True if r.ok else False)
assert(len(r.content) > 256)
......@@ -97,12 +97,13 @@ DUPLICATE_WHITELIST = (
('OBJECT_OT_bake', 'OBJECT_OT_bake_image'),
('OBJECT_OT_duplicate_move', 'OBJECT_OT_duplicate_move_linked'),
('WM_OT_context_cycle_enum', 'WM_OT_context_toggle', 'WM_OT_context_toggle_enum'),
('WM_OT_context_set_boolean', 'WM_OT_context_set_enum', 'WM_OT_context_set_float', 'WM_OT_context_set_int', 'WM_OT_context_set_string', 'WM_OT_context_set_value'),
)
('WM_OT_context_set_boolean', 'WM_OT_context_set_enum', 'WM_OT_context_set_float',
'WM_OT_context_set_int', 'WM_OT_context_set_string', 'WM_OT_context_set_value'),
)
DUPLICATE_IGNORE = {
"",
}
}
def check_duplicates():
......
......@@ -47,9 +47,10 @@ else:
import enchant
dict_spelling = enchant.Dict("en_US")
from check_spelling_c_config import (dict_custom,
dict_ignore,
)
from check_spelling_c_config import (
dict_custom,
dict_ignore,
)
def words_from_text(text):
......@@ -118,11 +119,12 @@ def words_from_text(text):
class Comment:
__slots__ = ("file",
"text",
"line",
"type",
)
__slots__ = (
"file",
"text",
"line",
"type",
)
def __init__(self, file, text, line, type):
self.file = file
......@@ -183,10 +185,10 @@ def extract_c_comments(filepath):
r"\param[in,out]",
r"\param",
r"\page",
)
)
SKIP_COMMENTS = (
"BEGIN GPL LICENSE BLOCK",
)
)
# http://doc.qt.nokia.com/qtcreator-2.4/creator-task-lists.html#task-list-file-format
# file\tline\ttype\tdescription
......@@ -330,7 +332,7 @@ def spell_check_comments_recursive(dirpath):
def source_list(path, filename_check=None):
for dirpath, dirnames, filenames in os.walk(path):
# skip '.svn'
# skip '.git'
if dirpath.startswith("."):
continue
......@@ -341,7 +343,20 @@ def spell_check_comments_recursive(dirpath):
def is_source(filename):