Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tor
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
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Benjamin J. Thompson
Tor
Commits
63325c05
Commit
63325c05
authored
6 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Patches
Plain Diff
Add a chutney mode to travis.yml.
parent
b0826346
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+7
-1
7 additions, 1 deletion
.travis.yml
changes/chutney_ci
+3
-0
3 additions, 0 deletions
changes/chutney_ci
with
10 additions
and
1 deletion
.travis.yml
+
7
−
1
View file @
63325c05
...
...
@@ -40,6 +40,10 @@ matrix:
# - env: HARDENING_OPTIONS=""
## We check asciidoc with distcheck, to make sure we remove doc products
-
env
:
DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
# We also try running a hardened clang build with chutney on Linux.
-
env
:
CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2"
compiler
:
clang
os
:
linux
## Uncomment to allow the build to report success (with non-required
## sub-builds continuing to run) if all required sub-builds have
...
...
@@ -142,7 +146,8 @@ install:
-
if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi
## If we're on OSX, and using asciidoc, configure asciidoc
-
if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi
##
## If we're running chutney, install it.
-
if [[ "$CHUTNEY" != "" ]]; then git clone --depth 1 https://github.com/torproject/chutney.git ; export CHUTNEY_PATH="$(pwd)/chutney"; fi
## Finally, list installed package versions
-
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi
...
...
@@ -155,6 +160,7 @@ script:
## We run `make check` because that's what https://jenkins.torproject.org does.
-
if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi
-
if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi
-
if [[ "$CHUTNEY" != "" ]]; then make test-network-all; fi
## If this build was one that produced coverage, upload it.
-
if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi
...
...
This diff is collapsed.
Click to expand it.
changes/chutney_ci
0 → 100644
+
3
−
0
View file @
63325c05
o Minor features (continuous integration):
- Our Travis configuration now uses Chutney to run some network
integration tests automatically. Closes ticket 29280.
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