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
fc5281f6
Commit
fc5281f6
authored
9 years ago
by
Michael Lumish
Browse files
Options
Downloads
Plain Diff
Merge pull request #4632 from ctiller/dep_head
Fix building submodules at head
parents
08506402
b361b4ed
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tools/jenkins/run_jenkins.sh
+10
-4
10 additions, 4 deletions
tools/jenkins/run_jenkins.sh
tools/run_tests/run_tests.py
+26
-18
26 additions, 18 deletions
tools/run_tests/run_tests.py
with
36 additions
and
22 deletions
tools/jenkins/run_jenkins.sh
+
10
−
4
View file @
fc5281f6
...
...
@@ -54,7 +54,7 @@ if [ "$platform" == "linux" ]
then
echo
"building
$language
on Linux"
./tools/run_tests/run_tests.py
--use_docker
-t
-l
$language
-c
$config
-x
report.xml
$@
||
true
./tools/run_tests/run_tests.py
--use_docker
-t
-l
$language
-c
$config
-x
report.xml
$@
||
TESTS_FAILED
=
"
true
"
elif
[
"
$platform
"
==
"windows"
]
then
...
...
@@ -63,19 +63,19 @@ then
# Prevent msbuild from picking up "platform" env variable, which would break the build
unset
platform
python tools/run_tests/run_tests.py
-t
-l
$language
-c
$config
-x
report.xml
$@
||
true
python tools/run_tests/run_tests.py
-t
-l
$language
-c
$config
-x
report.xml
$@
||
TESTS_FAILED
=
"
true
"
elif
[
"
$platform
"
==
"macos"
]
then
echo
"building
$language
on MacOS"
./tools/run_tests/run_tests.py
-t
-l
$language
-c
$config
-x
report.xml
$@
||
true
./tools/run_tests/run_tests.py
-t
-l
$language
-c
$config
-x
report.xml
$@
||
TESTS_FAILED
=
"
true
"
elif
[
"
$platform
"
==
"freebsd"
]
then
echo
"building
$language
on FreeBSD"
MAKE
=
gmake ./tools/run_tests/run_tests.py
-t
-l
$language
-c
$config
-x
report.xml
$@
||
true
MAKE
=
gmake ./tools/run_tests/run_tests.py
-t
-l
$language
-c
$config
-x
report.xml
$@
||
TESTS_FAILED
=
"
true
"
else
echo
"Unknown platform
$platform
"
...
...
@@ -87,3 +87,9 @@ then
mkdir
-p
reports
echo
'No reports generated.'
>
reports/index.html
fi
if
[
"
$TESTS_FAILED
"
!=
""
]
then
exit
1
fi
This diff is collapsed.
Click to expand it.
tools/run_tests/run_tests.py
+
26
−
18
View file @
fc5281f6
...
...
@@ -53,6 +53,7 @@ import jobset
import
report_utils
import
watch_dirs
ROOT
=
os
.
path
.
abspath
(
os
.
path
.
join
(
os
.
path
.
dirname
(
sys
.
argv
[
0
]),
'
../..
'
))
os
.
chdir
(
ROOT
)
...
...
@@ -685,23 +686,30 @@ if args.use_docker:
sys
.
exit
(
0
)
# update submodules if necessary
if
args
.
update_submodules
:
for
spec
in
args
.
update_submodules
:
spec
=
spec
.
split
(
'
:
'
,
1
)
if
len
(
spec
)
==
1
:
submodule
=
spec
[
0
]
branch
=
'
master
'
elif
len
(
spec
)
==
2
:
submodule
=
spec
[
0
]
branch
=
spec
[
1
]
cwd
=
'
third_party/%s
'
%
submodule
def
git
(
cmd
,
cwd
=
cwd
):
print
'
in %s: git %s
'
%
(
cwd
,
cmd
)
subprocess
.
check_call
(
'
git %s
'
%
cmd
,
cwd
=
cwd
,
shell
=
True
)
git
(
'
fetch
'
)
git
(
'
checkout %s
'
%
branch
)
git
(
'
pull origin %s
'
%
branch
)
subprocess
.
check_call
(
'
tools/buildgen/generate_projects.sh
'
,
shell
=
True
)
need_to_regenerate_projects
=
False
for
spec
in
args
.
update_submodules
:
spec
=
spec
.
split
(
'
:
'
,
1
)
if
len
(
spec
)
==
1
:
submodule
=
spec
[
0
]
branch
=
'
master
'
elif
len
(
spec
)
==
2
:
submodule
=
spec
[
0
]
branch
=
spec
[
1
]
cwd
=
'
third_party/%s
'
%
submodule
def
git
(
cmd
,
cwd
=
cwd
):
print
'
in %s: git %s
'
%
(
cwd
,
cmd
)
subprocess
.
check_call
(
'
git %s
'
%
cmd
,
cwd
=
cwd
,
shell
=
True
)
git
(
'
fetch
'
)
git
(
'
checkout %s
'
%
branch
)
git
(
'
pull origin %s
'
%
branch
)
if
os
.
path
.
exists
(
'
src/%s/gen_build_yaml.py
'
%
submodule
):
need_to_regenerate_projects
=
True
if
need_to_regenerate_projects
:
if
jobset
.
platform_string
()
==
'
linux
'
:
subprocess
.
check_call
(
'
tools/buildgen/generate_projects.sh
'
,
shell
=
True
)
else
:
print
'
WARNING: may need to regenerate projects, but since we are not on
'
print
'
Linux this step is being skipped. Compilation MAY fail.
'
# grab config
...
...
@@ -962,7 +970,7 @@ def _build_and_run(
newline_on_success
=
newline_on_success
,
travis
=
args
.
travis
)
if
num_failures
:
return
1
if
build_only
:
return
0
...
...
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