Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
f72d7b5a
Commit
f72d7b5a
authored
9 years ago
by
Nicolas "Pixel" Noble
Browse files
Options
Downloads
Patches
Plain Diff
Supporting Msys2's python.
parent
028a4e9e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tools/run_tests/jobset.py
+15
-3
15 additions, 3 deletions
tools/run_tests/jobset.py
tools/run_tests/run_tests.py
+3
-10
3 additions, 10 deletions
tools/run_tests/run_tests.py
with
18 additions
and
13 deletions
tools/run_tests/jobset.py
+
15
−
3
View file @
f72d7b5a
...
...
@@ -43,11 +43,23 @@ import time
_DEFAULT_MAX_JOBS
=
16
*
multiprocessing
.
cpu_count
()
_MAX_RESULT_SIZE
=
8192
def
platform_string
():
if
platform
.
system
()
==
'
Windows
'
:
return
'
windows
'
elif
platform
.
system
()[:
7
]
==
'
MSYS_NT
'
:
return
'
windows
'
elif
platform
.
system
()
==
'
Darwin
'
:
return
'
mac
'
elif
platform
.
system
()
==
'
Linux
'
:
return
'
linux
'
else
:
return
'
posix
'
# setup a signal handler so that signal.pause registers 'something'
# when a child finishes
# not using futures and threading to avoid a dependency on subprocess32
if
platform
.
system
()
==
'
W
indows
'
:
if
platform
_string
()
==
'
w
indows
'
:
pass
else
:
have_alarm
=
False
...
...
@@ -99,7 +111,7 @@ def message(tag, msg, explanatory_text=None, do_newline=False):
message
.
old_tag
=
tag
message
.
old_msg
=
msg
try
:
if
platform
.
system
()
==
'
W
indows
'
or
not
sys
.
stdout
.
isatty
():
if
platform
_string
()
==
'
w
indows
'
or
not
sys
.
stdout
.
isatty
():
if
explanatory_text
:
print
explanatory_text
print
'
%s: %s
'
%
(
tag
,
msg
)
...
...
@@ -359,7 +371,7 @@ class Jobset(object):
if
(
not
self
.
_travis
):
message
(
'
WAITING
'
,
'
%d jobs running, %d complete, %d failed
'
%
(
len
(
self
.
_running
),
self
.
_completed
,
self
.
_failures
))
if
platform
.
system
()
==
'
W
indows
'
:
if
platform
_string
()
==
'
w
indows
'
:
time
.
sleep
(
0.1
)
else
:
global
have_alarm
...
...
This diff is collapsed.
Click to expand it.
tools/run_tests/run_tests.py
+
3
−
10
View file @
f72d7b5a
...
...
@@ -60,14 +60,7 @@ _FORCE_ENVIRON_FOR_WRAPPERS = {}
def
platform_string
():
if
platform
.
system
()
==
'
Windows
'
:
return
'
windows
'
elif
platform
.
system
()
==
'
Darwin
'
:
return
'
mac
'
elif
platform
.
system
()
==
'
Linux
'
:
return
'
linux
'
else
:
return
'
posix
'
return
jobset
.
platform_string
()
# SimpleConfig: just compile with CONFIG=config, and run the binary to test
...
...
@@ -640,7 +633,7 @@ if len(build_configs) > 1:
print
language
,
'
does not support multiple build configurations
'
sys
.
exit
(
1
)
if
platform
.
system
()
==
'
W
indows
'
:
if
platform
_string
()
==
'
w
indows
'
:
def
make_jobspec
(
cfg
,
targets
,
makefile
=
'
Makefile
'
):
extra_args
=
[]
# better do parallel compilation
...
...
@@ -770,7 +763,7 @@ def _start_port_server(port_server_port):
'
-p
'
,
'
%d
'
%
port_server_port
,
'
-l
'
,
logfile
]
env
=
dict
(
os
.
environ
)
env
[
'
BUILD_ID
'
]
=
'
pleaseDontKillMeJenkins
'
if
platform
.
system
()
==
'
W
indows
'
:
if
platform
_string
()
==
'
w
indows
'
:
# Working directory of port server needs to be outside of Jenkins
# workspace to prevent file lock issues.
tempdir
=
tempfile
.
mkdtemp
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment