Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pyodide
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
pyodide
Commits
bb53e36a
Commit
bb53e36a
authored
Oct 23, 2018
by
Roman Yurchak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename to dryrun, add docstring and doctest
parent
4abdff51
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
8 deletions
+31
-8
.circleci/config.yml
.circleci/config.yml
+3
-3
pyodide_build/pywasmcross.py
pyodide_build/pywasmcross.py
+25
-3
setup.cfg
setup.cfg
+1
-0
test/pyodide_build/test_pywasmcross.py
test/pyodide_build/test_pywasmcross.py
+2
-2
No files found.
.circleci/config.yml
View file @
bb53e36a
...
...
@@ -56,7 +56,7 @@ jobs:
-
run
:
name
:
test
command
:
|
pytest test -v -k firefox
pytest test
pyodide_build
-v -k firefox
test-chrome
:
<<
:
*defaults
...
...
@@ -67,7 +67,7 @@ jobs:
-
run
:
name
:
test
command
:
|
pytest test -v -k chrome
pytest test
pyodide_build
-v -k chrome
test-python
:
<<
:
*defaults
...
...
@@ -80,7 +80,7 @@ jobs:
-
run
:
name
:
test
command
:
|
pytest test -v -k 'not (chrome or firefox)' --cov=pyodide_build --cov=pyodide
pytest test
pyodide_build
-v -k 'not (chrome or firefox)' --cov=pyodide_build --cov=pyodide
benchmark
:
<<
:
*defaults
...
...
pyodide_build/pywasmcross.py
View file @
bb53e36a
...
...
@@ -105,7 +105,29 @@ def capture_compile(args):
sys
.
exit
(
result
.
returncode
)
def
handle_command
(
line
,
args
,
pretend
=
False
):
def
handle_command
(
line
,
args
,
dryrun
=
False
):
"""Handle a compilation command
Parameters
----------
line : iterable
an iterable with the compilation arguments
args : {object, namedtuple}
an container with additional compilation options,
in particular containing ``args.cflags`` and ``args.ldflags``
dryrun : bool, default=False
if True do not run the resulting command, only return it
Examples
--------
>>> from collections import namedtuple
>>> Args = namedtuple('args', ['cflags', 'ldflags'])
>>> args = Args(cflags='', ldflags='')
>>> handle_command(['gcc', 'test.c'], args, dryrun=True)
emcc test.c
['emcc', 'test.c']
"""
# This is a special case to skip the compilation tests in numpy that aren't
# actually part of the build
for
arg
in
line
:
...
...
@@ -156,7 +178,7 @@ def handle_command(line, args, pretend=False):
print
(
' '
.
join
(
new_args
))
if
not
pretend
:
if
not
dryrun
:
result
=
subprocess
.
run
(
new_args
)
if
result
.
returncode
!=
0
:
sys
.
exit
(
result
.
returncode
)
...
...
@@ -170,7 +192,7 @@ def handle_command(line, args, pretend=False):
if
renamed
.
endswith
(
ext
):
renamed
=
renamed
[:
-
len
(
ext
)]
+
'.so'
break
if
not
pretend
:
if
not
dryrun
:
os
.
rename
(
output
,
renamed
)
return
new_args
...
...
setup.cfg
View file @
bb53e36a
...
...
@@ -2,3 +2,4 @@
addopts =
-r sxX
--instafail
--doctest-modules
test/pyodide_build/test_pywasmcross.py
View file @
bb53e36a
...
...
@@ -11,11 +11,11 @@ def _args_wrapper(func):
"""Convert function to take as input / return a string instead of a
list of arguments
Also sets
pretend
=True
Also sets
dryrun
=True
"""
def
_inner
(
line
,
*
pargs
):
args
=
line
.
split
()
res
=
func
(
args
,
*
pargs
,
pretend
=
True
)
res
=
func
(
args
,
*
pargs
,
dryrun
=
True
)
if
hasattr
(
res
,
'__len__'
):
return
' '
.
join
(
res
)
else
:
...
...
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