Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
e049f470
Commit
e049f470
authored
Aug 24, 2011
by
Éric Araujo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test_packaging on Windows (#12678).
See the distutils commit message for more detail.
parent
09ab4f86
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
Lib/packaging/tests/support.py
Lib/packaging/tests/support.py
+2
-2
Lib/packaging/tests/test_command_install_dist.py
Lib/packaging/tests/test_command_install_dist.py
+14
-2
No files found.
Lib/packaging/tests/support.py
View file @
e049f470
...
...
@@ -323,8 +323,8 @@ def fixup_build_ext(cmd):
support.fixup_build_ext(cmd)
cmd.ensure_finalized()
"""
if
os
.
name
==
"nt"
:
cmd
.
debug
=
sys
.
executable
.
endswith
(
"_d.exe"
)
if
os
.
name
==
'nt'
:
cmd
.
debug
=
sys
.
executable
.
endswith
(
'_d.exe'
)
elif
sysconfig
.
get_config_var
(
'Py_ENABLE_SHARED'
):
# To further add to the shared builds fun on Unix, we can't just add
# library_dirs to the Extension() instance because that doesn't get
...
...
Lib/packaging/tests/test_command_install_dist.py
View file @
e049f470
...
...
@@ -5,6 +5,7 @@ import sys
from
sysconfig
import
(
get_scheme_names
,
get_config_vars
,
_SCHEMES
,
get_config_var
,
get_path
)
from
packaging.command.build_ext
import
build_ext
from
packaging.command.install_dist
import
install_dist
from
packaging.compiler.extension
import
Extension
from
packaging.dist
import
Distribution
...
...
@@ -16,6 +17,13 @@ from packaging.tests import unittest, support
_CONFIG_VARS
=
get_config_vars
()
def
_make_ext_name
(
modname
):
if
os
.
name
==
'nt'
:
if
sys
.
executable
.
endswith
(
'_d.exe'
):
modname
+=
'_d'
return
modname
+
get_config_var
(
'SO'
)
class
InstallTestCase
(
support
.
TempdirManager
,
support
.
LoggingCatcher
,
unittest
.
TestCase
):
...
...
@@ -204,10 +212,14 @@ class InstallTestCase(support.TempdirManager,
Extension
(
'xx'
,
[
'xxmodule.c'
])])
os
.
chdir
(
project_dir
)
support
.
copy_xxmodule_c
(
project_dir
)
support
.
fixup_build_ext
(
dist
.
get_command_obj
(
'build_ext'
))
buildextcmd
=
build_ext
(
dist
)
support
.
fixup_build_ext
(
buildextcmd
)
buildextcmd
.
ensure_finalized
()
cmd
=
install_dist
(
dist
)
dist
.
command_obj
[
'install_dist'
]
=
cmd
dist
.
command_obj
[
'build_ext'
]
=
buildextcmd
cmd
.
root
=
install_dir
cmd
.
record
=
os
.
path
.
join
(
project_dir
,
'filelist'
)
cmd
.
ensure_finalized
()
...
...
@@ -217,7 +229,7 @@ class InstallTestCase(support.TempdirManager,
content
=
f
.
read
()
found
=
[
os
.
path
.
basename
(
line
)
for
line
in
content
.
splitlines
()]
expected
=
[
'xx%s'
%
get_config_var
(
'SO
'
),
expected
=
[
_make_ext_name
(
'xx
'
),
'METADATA'
,
'INSTALLER'
,
'REQUESTED'
,
'RECORD'
]
self
.
assertEqual
(
found
,
expected
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment