Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
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
The Tor Project
Core
Tor
Commits
f5b94715
Commit
f5b94715
authored
4 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Patches
Plain Diff
CI: improve output when skipping doxygen
parent
50b7bd24
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scripts/ci/ci-driver.sh
+16
-4
16 additions, 4 deletions
scripts/ci/ci-driver.sh
with
16 additions
and
4 deletions
scripts/ci/ci-driver.sh
+
16
−
4
View file @
f5b94715
...
...
@@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}"
if
[[
"
${
COLOR_CI
}
"
==
"yes"
]]
;
then
T_RED
=
$(
tput setaf 1
||
true
)
T_GREEN
=
$(
tput setaf 2
||
true
)
T_YELLOW
=
$(
tput setaf 3
||
true
)
T_DIM
=
$(
tput dim
||
true
)
T_BOLD
=
$(
tput bold
||
true
)
T_RESET
=
$(
tput sgr0
||
true
)
else
T_RED
=
T_GREEN
=
T_YELLOW
=
T_DIM
=
T_BOLD
=
T_RESET
=
...
...
@@ -85,6 +87,12 @@ function die()
echo
"
${
T_BOLD
}${
T_RED
}
FATAL ERROR:
${
T_RESET
}
$*
"
1>&2
exit
1
}
function
skipping
()
{
echo
"
${
T_BOLD
}${
T_YELLOW
}
Skipping
$*
${
T_RESET
}
"
}
function
hooray
()
{
echo
"
${
T_BOLD
}${
T_GREEN
}
$*
${
T_RESET
}
"
...
...
@@ -363,12 +371,16 @@ fi
FAILED_TESTS
=
""
if
[[
"
${
DOXYGEN
}
"
=
'yes'
&&
"
${
TOR_VER_AT_LEAST_043
}
"
=
'yes'
]]
;
then
if
[[
"
${
DOXYGEN
}
"
=
'yes'
]]
;
then
start_section Doxygen
if
runcmd make doxygen
;
then
hooray
"make doxygen has succeeded."
if
[[
"
${
TOR_VER_AT_LEAST_043
}
"
=
'yes'
]]
;
then
if
runcmd make doxygen
;
then
hooray
"make doxygen has succeeded."
else
FAILED_TESTS
=
"
${
FAILED_TESTS
}
doxygen"
fi
else
FAILED_TESTS
=
"
${
FAILED_TESTS
}
doxygen
"
skipping
"make doxygen: doxygen is broken for Tor < 0.4.3
"
fi
end_section Doxygen
fi
...
...
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