[pypy-commit] pypy py3.3: Add a test for the correct #pragma in pyconfig.h, and fix it: wrong #pragma!

arigo noreply at buildbot.pypy.org
Mon Oct 19 03:44:25 EDT 2015


Author: Armin Rigo <arigo at tunes.org>
Branch: py3.3
Changeset: r80333:f0f52b8b046c
Date: 2015-10-19 09:44 +0200
http://bitbucket.org/pypy/pypy/changeset/f0f52b8b046c/

Log:	Add a test for the correct #pragma in pyconfig.h, and fix it: wrong
	#pragma!

diff --git a/pypy/module/cpyext/include/pyconfig.h b/pypy/module/cpyext/include/pyconfig.h
--- a/pypy/module/cpyext/include/pyconfig.h
+++ b/pypy/module/cpyext/include/pyconfig.h
@@ -38,9 +38,9 @@
       * taken care of by distutils.) */
 #        ifdef _DEBUG
 #            error("debug first with cpython")    
-#            pragma comment(lib,"python32.lib")
+#            pragma comment(lib,"python33.lib")
 #        else
-#            pragma comment(lib,"python32.lib")
+#            pragma comment(lib,"python33.lib")
 #        endif /* _DEBUG */
 #    endif
 #endif /* _MSC_VER */
diff --git a/pypy/module/cpyext/test/test_version.py b/pypy/module/cpyext/test/test_version.py
--- a/pypy/module/cpyext/test/test_version.py
+++ b/pypy/module/cpyext/test/test_version.py
@@ -1,6 +1,16 @@
+import py
 from pypy.module.cpyext.test.test_cpyext import AppTestCpythonExtensionBase
 
 
+def test_pragma_version():
+    from pypy.module.sys.version import CPYTHON_VERSION
+    rootdir = py.path.local(__file__).join('..', '..')
+    pyconfig_h = rootdir.join('include', 'pyconfig.h')
+    version = '%d%d' % (CPYTHON_VERSION[0], CPYTHON_VERSION[1])
+    pragma = 'pragma comment(lib,"python%s.lib")' % version
+    assert pragma in pyconfig_h.read()
+
+
 class AppTestVersion(AppTestCpythonExtensionBase):
 
     def test_versions(self):


More information about the pypy-commit mailing list