Merge branch 'master' into next

Conflicts:
	package/go/go.hash
	package/go/go.mk

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Arnout Vandecappelle (Essensium/Mind)
2021-08-26 23:40:39 +02:00
233 changed files with 4109 additions and 1116 deletions

View File

@@ -16,7 +16,7 @@ class TestDockerCompose(infra.basetest.BRTest):
BR2_ROOTFS_POST_SCRIPT_ARGS="{}"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}"
BR2_PACKAGE_CA_CERTIFICATES=y

View File

@@ -1,17 +1,6 @@
from tests.package.test_python import TestPythonPackageBase
class TestPythonPy2Cryptography(TestPythonPackageBase):
__test__ = True
config = TestPythonPackageBase.config + \
"""
BR2_PACKAGE_PYTHON=y
BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y
"""
sample_scripts = ["tests/package/sample_python_cryptography.py"]
timeout = 40
class TestPythonPy3Cryptography(TestPythonPackageBase):
__test__ = True
config = TestPythonPackageBase.config + \

View File

@@ -1,17 +1,6 @@
from tests.package.test_python import TestPythonPackageBase
class TestPythonPy2ServiceIdentity(TestPythonPackageBase):
__test__ = True
config = TestPythonPackageBase.config + \
"""
BR2_PACKAGE_PYTHON=y
BR2_PACKAGE_PYTHON_SERVICE_IDENTITY=y
"""
sample_scripts = ["tests/package/sample_python_service_identity.py"]
timeout = 30
class TestPythonPy3ServiceIdentity(TestPythonPackageBase):
__test__ = True
config = TestPythonPackageBase.config + \

View File

@@ -12,15 +12,6 @@ class TestPythonTreq(TestPythonPackageBase):
self.assertEqual(exit_code, 0)
class TestPythonPy2Treq(TestPythonTreq):
__test__ = True
config = TestPythonTreq.config + \
"""
BR2_PACKAGE_PYTHON=y
BR2_PACKAGE_PYTHON_TREQ=y
"""
class TestPythonPy3Treq(TestPythonTreq):
__test__ = True
config = TestPythonTreq.config + \

View File

@@ -21,15 +21,6 @@ class TestPythonTwisted(TestPythonPackageBase):
self.assertEqual(exit_code, 0)
class TestPythonPy2Twisted(TestPythonTwisted):
__test__ = True
config = TestPythonTwisted.config + \
"""
BR2_PACKAGE_PYTHON=y
BR2_PACKAGE_PYTHON_TWISTED=y
"""
class TestPythonPy3Twisted(TestPythonTwisted):
__test__ = True
config = TestPythonTwisted.config + \

View File

@@ -1,17 +1,6 @@
from tests.package.test_python import TestPythonPackageBase
class TestPythonPy2Txtorcon(TestPythonPackageBase):
__test__ = True
config = TestPythonPackageBase.config + \
"""
BR2_PACKAGE_PYTHON=y
BR2_PACKAGE_PYTHON_TXTORCON=y
"""
sample_scripts = ["tests/package/sample_python_txtorcon.py"]
timeout = 30
class TestPythonPy3Txtorcon(TestPythonPackageBase):
__test__ = True
config = TestPythonPackageBase.config + \