From e8b58b251a35f12e7cb085dc5f51429f4ff2db2f Mon Sep 17 00:00:00 2001 From: Laurence Tratt Date: Mon, 15 Aug 2011 16:10:35 +0100 Subject: Basic OpenBSD support. --- lib-python/modified-2.7/test/regrtest.py | 21 ++++- lib-python/modified-2.7/test/test_fcntl.py | 108 ++++++++++++++++++++++++++ lib-python/modified-2.7/test/test_tempfile.py | 4 +- pypy/module/fcntl/test/test_fcntl.py | 5 +- pypy/rpython/module/ll_os_stat.py | 8 +- pypy/translator/c/gc.py | 2 +- pypy/translator/platform/__init__.py | 7 ++ pypy/translator/platform/openbsd.py | 61 +++++++++++++++ 8 files changed, 206 insertions(+), 10 deletions(-) create mode 100644 lib-python/modified-2.7/test/test_fcntl.py create mode 100644 pypy/translator/platform/openbsd.py diff --git a/lib-python/modified-2.7/test/regrtest.py b/lib-python/modified-2.7/test/regrtest.py index 86b7628de1..37e5b74399 100755 --- a/lib-python/modified-2.7/test/regrtest.py +++ b/lib-python/modified-2.7/test/regrtest.py @@ -1403,7 +1403,26 @@ _expectations = { test_zipimport test_zlib """, - 'openbsd3': + 'openbsd4': + """ + test_ascii_formatd + test_bsddb + test_bsddb3 + test_ctypes + test_dl + test_epoll + test_gdbm + test_locale + test_normalization + test_ossaudiodev + test_pep277 + test_tcl + test_tk + test_ttk_guionly + test_ttk_textonly + test_multiprocessing + """, + 'openbsd5': """ test_ascii_formatd test_bsddb diff --git a/lib-python/modified-2.7/test/test_fcntl.py b/lib-python/modified-2.7/test/test_fcntl.py new file mode 100644 index 0000000000..4d3bdf1d49 --- /dev/null +++ b/lib-python/modified-2.7/test/test_fcntl.py @@ -0,0 +1,108 @@ +"""Test program for the fcntl C module. + +OS/2+EMX doesn't support the file locking operations. + +""" +import os +import struct +import sys +import unittest +from test.test_support import (verbose, TESTFN, unlink, run_unittest, + import_module) + +# Skip test if no fnctl module. +fcntl = import_module('fcntl') + + +# TODO - Write tests for flock() and lockf(). + +def get_lockdata(): + if sys.platform.startswith('atheos'): + start_len = "qq" + else: + try: + os.O_LARGEFILE + except AttributeError: + start_len = "ll" + else: + start_len = "qq" + + if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3', + 'Darwin1.2', 'darwin', + 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', + 'freebsd6', 'freebsd7', 'freebsd8', + 'bsdos2', 'bsdos3', 'bsdos4', + 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4', 'openbsd5'): + if struct.calcsize('l') == 8: + off_t = 'l' + pid_t = 'i' + else: + off_t = 'lxxxx' + pid_t = 'l' + lockdata = struct.pack(off_t + off_t + pid_t + 'hh', 0, 0, 0, + fcntl.F_WRLCK, 0) + elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']: + lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0) + elif sys.platform in ['os2emx']: + lockdata = None + else: + lockdata = struct.pack('hh'+start_len+'hh', fcntl.F_WRLCK, 0, 0, 0, 0, 0) + if lockdata: + if verbose: + print 'struct.pack: ', repr(lockdata) + return lockdata + +lockdata = get_lockdata() + + +class TestFcntl(unittest.TestCase): + + def setUp(self): + self.f = None + + def tearDown(self): + if self.f and not self.f.closed: + self.f.close() + unlink(TESTFN) + + def test_fcntl_fileno(self): + # the example from the library docs + self.f = open(TESTFN, 'w') + rv = fcntl.fcntl(self.f.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) + if verbose: + print 'Status from fcntl with O_NONBLOCK: ', rv + if sys.platform not in ['os2emx']: + rv = fcntl.fcntl(self.f.fileno(), fcntl.F_SETLKW, lockdata) + if verbose: + print 'String from fcntl with F_SETLKW: ', repr(rv) + self.f.close() + + def test_fcntl_file_descriptor(self): + # again, but pass the file rather than numeric descriptor + self.f = open(TESTFN, 'w') + rv = fcntl.fcntl(self.f, fcntl.F_SETFL, os.O_NONBLOCK) + if sys.platform not in ['os2emx']: + rv = fcntl.fcntl(self.f, fcntl.F_SETLKW, lockdata) + self.f.close() + + def test_fcntl_64_bit(self): + # Issue #1309352: fcntl shouldn't fail when the third arg fits in a + # C 'long' but not in a C 'int'. + try: + cmd = fcntl.F_NOTIFY + # This flag is larger than 2**31 in 64-bit builds + flags = fcntl.DN_MULTISHOT + except AttributeError: + self.skipTest("F_NOTIFY or DN_MULTISHOT unavailable") + fd = os.open(os.path.dirname(os.path.abspath(TESTFN)), os.O_RDONLY) + try: + fcntl.fcntl(fd, cmd, flags) + finally: + os.close(fd) + + +def test_main(): + run_unittest(TestFcntl) + +if __name__ == '__main__': + test_main() diff --git a/lib-python/modified-2.7/test/test_tempfile.py b/lib-python/modified-2.7/test/test_tempfile.py index b124218c62..bfedef9d6b 100644 --- a/lib-python/modified-2.7/test/test_tempfile.py +++ b/lib-python/modified-2.7/test/test_tempfile.py @@ -23,8 +23,8 @@ has_spawnl = hasattr(os, 'spawnl') # TEST_FILES may need to be tweaked for systems depending on the maximum # number of files that can be opened at one time (see ulimit -n) -if sys.platform in ('openbsd3', 'openbsd4'): - TEST_FILES = 48 +if sys.platform.startswith("openbsd"): + TEST_FILES = 64 # ulimit -n defaults to 128 for normal users else: TEST_FILES = 100 diff --git a/pypy/module/fcntl/test/test_fcntl.py b/pypy/module/fcntl/test/test_fcntl.py index 7cbc68b3e2..614c3f7b9e 100644 --- a/pypy/module/fcntl/test/test_fcntl.py +++ b/pypy/module/fcntl/test/test_fcntl.py @@ -47,7 +47,8 @@ class AppTestFcntl: 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'bsdos2', 'bsdos3', 'bsdos4', - 'openbsd', 'openbsd2', 'openbsd3'): + 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4', + 'openbsd5'): if struct.calcsize('l') == 8: off_t = 'l' pid_t = 'i' @@ -181,7 +182,7 @@ class AppTestFcntl: def test_large_flag(self): import sys - if sys.platform == "darwin": + if sys.platform == "darwin" or sys.platform.startswith("openbsd"): skip("Mac OS doesn't have any large flag in fcntl.h") import fcntl, sys if sys.maxint == 2147483647: diff --git a/pypy/rpython/module/ll_os_stat.py b/pypy/rpython/module/ll_os_stat.py index 7aa3ebb4e2..e3f02360bc 100644 --- a/pypy/rpython/module/ll_os_stat.py +++ b/pypy/rpython/module/ll_os_stat.py @@ -21,7 +21,7 @@ from pypy.rpython.annlowlevel import hlstr # sub-second timestamps. # - TIMESPEC is defined when the "struct stat" contains st_atim field. -if sys.platform.startswith('linux'): +if sys.platform.startswith('linux') or sys.platform.startswith('openbsd'): TIMESPEC = platform.Struct('struct timespec', [('tv_sec', rffi.TIME_T), ('tv_nsec', rffi.LONG)]) @@ -185,9 +185,9 @@ if sys.platform != 'win32': def build_stat_result(st): # only for LL backends if TIMESPEC is not None: - atim = st.c_st_atim; atime = atim.c_tv_sec + 1E-9 * atim.c_tv_nsec - mtim = st.c_st_mtim; mtime = mtim.c_tv_sec + 1E-9 * mtim.c_tv_nsec - ctim = st.c_st_ctim; ctime = ctim.c_tv_sec + 1E-9 * ctim.c_tv_nsec + atim = st.c_st_atim; atime = int(atim.c_tv_sec) + 1E-9 * int(atim.c_tv_nsec) + mtim = st.c_st_mtim; mtime = int(mtim.c_tv_sec) + 1E-9 * int(mtim.c_tv_nsec) + ctim = st.c_st_ctim; ctime = int(ctim.c_tv_sec) + 1E-9 * int(ctim.c_tv_nsec) else: atime = st.c_st_atime mtime = st.c_st_mtime diff --git a/pypy/translator/c/gc.py b/pypy/translator/c/gc.py index 4aae017e05..9a44afdf6c 100644 --- a/pypy/translator/c/gc.py +++ b/pypy/translator/c/gc.py @@ -229,7 +229,7 @@ class BoehmGcPolicy(BasicGcPolicy): if sys.platform.startswith('linux'): pre_include_bits += ["#define _REENTRANT 1", "#define GC_LINUX_THREADS 1"] - if sys.platform != "win32": + if sys.platform != "win32" and not sys.platform.startswith("openbsd"): # GC_REDIRECT_TO_LOCAL is not supported on Win32 by gc6.8 pre_include_bits += ["#define GC_REDIRECT_TO_LOCAL 1"] diff --git a/pypy/translator/platform/__init__.py b/pypy/translator/platform/__init__.py index 82281eddd5..0b7775df76 100644 --- a/pypy/translator/platform/__init__.py +++ b/pypy/translator/platform/__init__.py @@ -252,6 +252,13 @@ elif "freebsd" in sys.platform: host_factory = Freebsd else: host_factory = Freebsd_64 +elif "openbsd" in sys.platform: + from pypy.translator.platform.openbsd import OpenBSD, OpenBSD_64 + import platform + if platform.architecture()[0] == '32bit': + host_factory = OpenBSD + else: + host_factory = OpenBSD_64 elif os.name == 'nt': from pypy.translator.platform.windows import Windows host_factory = Windows diff --git a/pypy/translator/platform/openbsd.py b/pypy/translator/platform/openbsd.py new file mode 100644 index 0000000000..1e6c6a5436 --- /dev/null +++ b/pypy/translator/platform/openbsd.py @@ -0,0 +1,61 @@ +"""Support for OpenBSD.""" + +import os + +from pypy.translator.platform import posix + +def get_env(key, default): + if key in os.environ: + return os.environ[key] + else: + return default + +def get_env_vector(key, default): + string = get_env(key, default) + # XXX: handle quotes + return string.split() + +class OpenBSD(posix.BasePosix): + name = "openbsd" + + link_flags = get_env_vector("LDFLAGS", '-pthread') + cflags = get_env_vector("CFLAGS", "-O3 -pthread -fomit-frame-pointer -D_BSD_SOURCE") + standalone_only = [] + shared_only = [] + so_ext = 'so' + make_cmd = 'gmake' + + def __init__(self, cc=None): + if cc is None: + cc = get_env("CC", "gcc") + super(OpenBSD, self).__init__(cc) + + def _args_for_shared(self, args): + return ['-shared'] + args + + def _preprocess_include_dirs(self, include_dirs): + res_incl_dirs = list(include_dirs) + res_incl_dirs.append(os.path.join(get_env("LOCALBASE", "/usr/local"), "include")) + return res_incl_dirs + + def _preprocess_library_dirs(self, library_dirs): + res_lib_dirs = list(library_dirs) + res_lib_dirs.append(os.path.join(get_env("LOCALBASE", "/usr/local"), "lib")) + return res_lib_dirs + + def _include_dirs_for_libffi(self): + return [os.path.join(get_env("LOCALBASE", "/usr/local"), "include")] + + def _library_dirs_for_libffi(self): + return [os.path.join(get_env("LOCALBASE", "/usr/local"), "lib")] + + def _libs(self, libraries): + libraries=set(libraries + ("intl", "iconv", "compat")) + return ['-l%s' % lib for lib in libraries if lib not in ["crypt", "dl", "rt"]] + + def check___thread(self): + # currently __thread is not supported by Darwin gccs + return False + +class OpenBSD_64(OpenBSD): + shared_only = ('-fPIC',) -- cgit v1.2.3-65-gdbad