[pypy-commit] buildbot default: add platform-specific factory for aarch64 so that package.py gets the right archive-name
Author: Matti Picus
Branch:
Changeset: r1089:89139fc90e06
Date: 2019-08-11 04:58 +0300
http://bitbucket.org/pypy/buildbot/changeset/89139fc90e06/
Log:add platform-specific factory for aarch64 so that package.py gets
the right archive-name
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -175,6 +175,14 @@
pypyjit=True,
app_tests=True)
+pypyJITTranslatedTestFactoryAARCH64 = pypybuilds.Translated(
+platform='aarch64',
+translationArgs=jit_translation_args,
+targetArgs=[],
+lib_python=True,
+pypyjit=True,
+app_tests=True)
+
pypyJITBenchmarkFactory = pypybuilds.JITBenchmark(host='benchmarker')
pypyJITBenchmarkFactory64 = pypybuilds.JITBenchmark(platform='linux64',
host='benchmarker',
@@ -517,7 +525,7 @@
#'slavenames': ["bencher4", "speed-old"],
'slavenames': ["aarch64_aws"],
'builddir': JITAARCH64,
- 'factory': pypyJITTranslatedTestFactory64,
+ 'factory': pypyJITTranslatedTestFactoryAARCH64,
'category': 'aarch64',
"locks": [AARCH64Lock.access('counting')],
},
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] buildbot default: Backed out changeset: 878ba7516062
Author: Matti Picus
Branch:
Changeset: r1088:2d6fb9e9de0b
Date: 2019-08-10 23:13 +0300
http://bitbucket.org/pypy/buildbot/changeset/2d6fb9e9de0b/
Log:Backed out changeset: 878ba7516062
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -274,7 +274,7 @@
]
extra_opts = {'xerxes': {'keepalive_interval': 15},
'aurora': {'max_builds': 1},
- 'SalsaSalsa': {'max_builds': 1},
+ 'salsa': {'max_builds': 1},
'hhu-raspberry-pi': {'max_builds': 1},
'hhu-pypy-pi': {'max_builds': 1},
'hhu-pypy-pi2': {'max_builds': 1},
@@ -584,7 +584,7 @@
"slavenames": ["SalsaSalsa", "anubis64"],
'builddir' : JITWIN32,
'factory' : pypyJITTranslatedTestFactoryWin,
- "locks": [WinSlaveLock.access('exclusive')],
+ "locks": [WinSlaveLock.access('counting')],
'category' : 'win32',
},
# PPC
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] pypy default: typo (thanks Ronan)
Author: Matti Picus
Branch:
Changeset: r97143:800256b0546d
Date: 2019-08-10 22:01 +0300
http://bitbucket.org/pypy/pypy/changeset/800256b0546d/
Log:typo (thanks Ronan)
diff --git a/testrunner/get_info.py b/testrunner/get_info.py
--- a/testrunner/get_info.py
+++ b/testrunner/get_info.py
@@ -9,11 +9,11 @@
BASE_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
if sys.platform.startswith('win'):
-TARGET_NAME = r'pypy-c.exe'
+TARGET_NAME = 'pypy-c.exe'
# PyPy uses bin as of PR https://github.com/pypa/virtualenv/pull/1400
TARGET_DIR = 'bin'
else:
-TARGET_NAME = 'pypy3-c'
+TARGET_NAME = 'pypy-c'
TARGET_DIR = 'bin'
VENV_DIR = 'pypy-venv'
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] buildbot default: somehow win32 builds are overlapping, try to restrict that
Author: Matti Picus
Branch:
Changeset: r1087:878ba7516062
Date: 2019-08-10 21:58 +0300
http://bitbucket.org/pypy/buildbot/changeset/878ba7516062/
Log:somehow win32 builds are overlapping, try to restrict that
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -274,7 +274,7 @@
]
extra_opts = {'xerxes': {'keepalive_interval': 15},
'aurora': {'max_builds': 1},
- 'salsa': {'max_builds': 1},
+ 'SalsaSalsa': {'max_builds': 1},
'hhu-raspberry-pi': {'max_builds': 1},
'hhu-pypy-pi': {'max_builds': 1},
'hhu-pypy-pi2': {'max_builds': 1},
@@ -584,7 +584,7 @@
"slavenames": ["SalsaSalsa", "anubis64"],
'builddir' : JITWIN32,
'factory' : pypyJITTranslatedTestFactoryWin,
- "locks": [WinSlaveLock.access('counting')],
+ "locks": [WinSlaveLock.access('exclusive')],
'category' : 'win32',
},
# PPC
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] pypy default: fix for latest virtualenv HEAD
Author: Matti Picus
Branch:
Changeset: r97141:adc92f0ac6c1
Date: 2019-08-10 21:41 +0300
http://bitbucket.org/pypy/pypy/changeset/adc92f0ac6c1/
Log:fix for latest virtualenv HEAD
diff --git a/testrunner/get_info.py b/testrunner/get_info.py
--- a/testrunner/get_info.py
+++ b/testrunner/get_info.py
@@ -10,9 +10,10 @@
BASE_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
if sys.platform.startswith('win'):
TARGET_NAME = r'pypy-c.exe'
-TARGET_DIR = 'Scripts'
+# PyPy uses bin as of PR https://github.com/pypa/virtualenv/pull/1400
+TARGET_DIR = 'bin'
else:
-TARGET_NAME = 'pypy-c'
+TARGET_NAME = 'pypy3-c'
TARGET_DIR = 'bin'
VENV_DIR = 'pypy-venv'
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] pypy py3.6: merge default into brach
Author: Matti Picus
Branch: py3.6
Changeset: r97142:018380765dc8
Date: 2019-08-10 21:50 +0300
http://bitbucket.org/pypy/pypy/changeset/018380765dc8/
Log:merge default into brach
diff --git a/pypy/module/_socket/test/test_sock_app.py
b/pypy/module/_socket/test/test_sock_app.py
--- a/pypy/module/_socket/test/test_sock_app.py
+++ b/pypy/module/_socket/test/test_sock_app.py
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
import sys, os
+import socket
import pytest
from pypy.tool.pytest.objspace import gettestobjspace
from pypy.interpreter.gateway import interp2app
@@ -10,8 +11,6 @@
def setup_module(mod):
mod.space = gettestobjspace(usemodules=['_socket', 'array', 'struct',
'unicodedata'])
-global socket
-import socket
mod.w_socket = space.appexec([], "(): import _socket as m; return m")
mod.path = udir.join('fd')
mod.path.write('fo')
@@ -57,15 +56,11 @@
"(_socket, name): return _socket.getservbyname(name,
'tcp')")
assert space.unwrap(port) == 25
# 1 arg version
-if sys.version_info < (2, 4):
-pytest.skip("getservbyname second argument is not optional before
python 2.4")
port = space.appexec([w_socket, space.wrap(name)],
"(_socket, name): return _socket.getservbyname(name)")
assert space.unwrap(port) == 25
def test_getservbyport():
-if sys.version_info < (2, 4):
-pytest.skip("getservbyport does not exist before python 2.4")
port = 25
# 2 args version
name = space.appexec([w_socket, space.wrap(port)],
@@ -90,6 +85,7 @@
"(_socket, name): return _socket.getprotobyname(name)")
assert space.unwrap(w_n) == socket.IPPROTO_TCP
+@pytest.mark.skipif("not hasattr(socket, 'fromfd')")
def test_ntohs():
w_n = space.appexec([w_socket, space.wrap(125)],
"(_socket, x): return _socket.ntohs(x)")
@@ -132,9 +128,8 @@
"(_socket, p): return _socket.inet_ntoa(p)")
assert space.utf8_w(w_ip) == ip
+@pytest.mark.skipif("not hasattr(socket, 'inet_pton')")
def test_pton_ntop_ipv4():
-if not hasattr(socket, 'inet_pton'):
-pytest.skip('No socket.inet_pton on this platform')
tests = [
("123.45.67.89", "\x7b\x2d\x43\x59"),
("0.0.0.0", "\x00" * 4),
@@ -191,11 +186,6 @@
"(_socket, ip): return _socket.inet_pton(_socket.AF_INET6, ip)")
assert space.unwrap(w_packed) == packed
-def test_has_ipv6():
-pytest.skip("has_ipv6 is always True on PyPy for now")
-res = space.appexec([w_socket], "(_socket): return _socket.has_ipv6")
-assert space.unwrap(res) == socket.has_ipv6
-
def test_getaddrinfo():
host = b"localhost"
port = 25
@@ -311,7 +301,7 @@
'unicodedata'])
def setup_class(cls):
-cls.space = space
+space = cls.space
cls.w_udir = space.wrap(str(udir))
def teardown_class(cls):
@@ -762,10 +752,11 @@
raises(TypeError, s.connect, (domain + '\x00', 80))
+@pytest.mark.skipif(not hasattr(os, 'getpid'),
+reason="AF_NETLINK needs os.getpid()")
class AppTestNetlink:
def setup_class(cls):
-if not hasattr(os, 'getpid'):
-pytest.skip("AF_NETLINK needs os.getpid()")
+cls.space = space
if cls.runappdirect:
import _socket
@@ -775,7 +766,6 @@
"return hasattr(_socket, 'AF_NETLINK')")
if not space.is_true(w_ok):
pytest.skip("no AF_NETLINK on this platform")
-cls.space = space
def test_connect_to_kernel_netlink_routing_socket(self):
import _socket, os
@@ -788,10 +778,11 @@
assert b == 0
+@pytest.mark.skipif(not hasattr(os, 'getuid') or os.getuid() != 0,
+reason="AF_PACKET needs to be root for testing")
class AppTestPacket:
def setup_class(cls):
-if not hasattr(os, 'getuid') or os.getuid() != 0:
-pytest.skip("AF_PACKET needs to be root for testing")
+cls.space = space
if cls.runappdirect:
import _socket
w_ok = hasattr(_socket, 'AF_PACKET')
@@ -800,7 +791,6 @@
"return hasattr(_socket, 'AF_PACKET')")
if not space.is_true(w_ok):
pytest.skip("no AF_PACKET on this platform")
-cls.space = space
def test_convert_between_tuple_and_sockaddr_ll(self):
import _socket
diff --git a/testrunner/get_info.py b/testrunner/get_info.py
--- a/testrunner/get_info.py
+++ b/testrunner/get_info.py
@@ -10,7 +10,8 @@
BASE_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
if sys.platform.startswith('win'):
TARGET_NAME = r'pypy3-c.exe'
-TARGET_DIR = 'Scripts'
+# PyPy uses bin as of PR https://github.com/pypa/virtualenv/pull/1400
+TARGET_DIR = 'bin'
else:
TARGET_NAME = 'pypy3-c'
TARGET_DIR = 'bin'
[pypy-commit] pypy default: Actually use the spaceconfig in AppTestSocket
Author: Ronan Lamy Branch: Changeset: r97140:a7aab2f5a528 Date: 2019-08-10 18:11 +0100 http://bitbucket.org/pypy/pypy/changeset/a7aab2f5a528/ Log:Actually use the spaceconfig in AppTestSocket diff --git a/pypy/module/_socket/test/test_sock_app.py b/pypy/module/_socket/test/test_sock_app.py --- a/pypy/module/_socket/test/test_sock_app.py +++ b/pypy/module/_socket/test/test_sock_app.py @@ -292,10 +292,10 @@ class AppTestSocket: -spaceconfig = dict(usemodules=['_socket', '_weakref', 'struct']) +spaceconfig = dict(usemodules=['_socket', 'struct']) def setup_class(cls): -cls.space = space +space = cls.space cls.w_udir = space.wrap(str(udir)) cls.w_regex_search = space.wrap(interp2app(regex_search)) ___ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
