Date: Mon, 22 Jul 2019 08:27:44 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r350209 - stable/11/tests/sys/opencrypto Message-ID: <201907220827.x6M8RiDB072189@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Mon Jul 22 08:27:44 2019 New Revision: 350209 URL: https://svnweb.freebsd.org/changeset/base/350209 Log: MFC r346431, r349872 r346431 Specify using Python2, these .py files have not been converted to use Python3 yet, but the default Python version in ports has been switched to 3. Sponsored by: The FreeBSD Foundation r349872 Correct definitions in sys.opencrypto.runtests.main for 32bit platform Reviewed by: cem, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D20894 Modified: stable/11/tests/sys/opencrypto/Makefile stable/11/tests/sys/opencrypto/cryptodev.py stable/11/tests/sys/opencrypto/cryptotest.py stable/11/tests/sys/opencrypto/runtests.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/tests/sys/opencrypto/Makefile ============================================================================== --- stable/11/tests/sys/opencrypto/Makefile Mon Jul 22 07:19:46 2019 (r350208) +++ stable/11/tests/sys/opencrypto/Makefile Mon Jul 22 08:27:44 2019 (r350209) @@ -7,7 +7,7 @@ BINDIR= ${TESTSDIR} PLAIN_TESTS_SH= runtests -TEST_METADATA.runtests+= required_programs="python" +TEST_METADATA.runtests+= required_programs="python2" TEST_METADATA.runtests+= required_user="root" PYMODULES= cryptodev.py cryptodevh.py cryptotest.py dpkt.py Modified: stable/11/tests/sys/opencrypto/cryptodev.py ============================================================================== --- stable/11/tests/sys/opencrypto/cryptodev.py Mon Jul 22 07:19:46 2019 (r350208) +++ stable/11/tests/sys/opencrypto/cryptodev.py Mon Jul 22 08:27:44 2019 (r350209) @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/local/bin/python2 # # Copyright (c) 2014 The FreeBSD Foundation # Copyright 2014 John-Mark Gurney @@ -34,6 +34,7 @@ import array import dpkt from fcntl import ioctl import os +import platform import signal from struct import pack as _pack @@ -105,14 +106,19 @@ class CryptAEAD(dpkt.Packet): # h2py.py can't handle multiarg macros CRIOGET = 3221513060 CIOCGSESSION = 3224396645 -CIOCGSESSION2 = 3225445226 CIOCFSESSION = 2147771238 -CIOCCRYPT = 3224396647 CIOCKEY = 3230688104 CIOCASYMFEAT = 1074029417 CIOCKEY2 = 3230688107 CIOCFINDDEV = 3223610220 -CIOCCRYPTAEAD = 3225445229 +if platform.architecture()[0] == '64bit': + CIOCGSESSION2 = 3225445226 + CIOCCRYPT = 3224396647 + CIOCCRYPTAEAD = 3225445229 +else: + CIOCGSESSION2 = 3224396650 + CIOCCRYPT = 3223085927 + CIOCCRYPTAEAD = 3223872365 def _getdev(): fd = os.open('/dev/crypto', os.O_RDWR) Modified: stable/11/tests/sys/opencrypto/cryptotest.py ============================================================================== --- stable/11/tests/sys/opencrypto/cryptotest.py Mon Jul 22 07:19:46 2019 (r350208) +++ stable/11/tests/sys/opencrypto/cryptotest.py Mon Jul 22 08:27:44 2019 (r350209) @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/local/bin/python2 # # Copyright (c) 2014 The FreeBSD Foundation # All rights reserved. Modified: stable/11/tests/sys/opencrypto/runtests.sh ============================================================================== --- stable/11/tests/sys/opencrypto/runtests.sh Mon Jul 22 07:19:46 2019 (r350208) +++ stable/11/tests/sys/opencrypto/runtests.sh Mon Jul 22 08:27:44 2019 (r350209) @@ -61,6 +61,6 @@ done oldcdas=$(sysctl -e kern.cryptodevallowsoft) sysctl kern.cryptodevallowsoft=1 -python $(dirname $0)/cryptotest.py +python2 $(dirname $0)/cryptotest.py sysctl "$oldcdas"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907220827.x6M8RiDB072189>