diff options
| author | teor <teor@torproject.org> | 2019-04-17 16:46:40 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-17 16:46:40 +1000 |
| commit | c72f0cd5c77ffceb6f0275295c3446a908b17a75 (patch) | |
| tree | 3e77d183724ad54259f56b140b42e175be57c4fb | |
| parent | 15591e1bbda17983fa2f8f099d48fcef2e675971 (diff) | |
| parent | 8ff6ab0a399235c081ef4413449581879b7db99b (diff) | |
| download | tor-c72f0cd5c77ffceb6f0275295c3446a908b17a75.tar.gz tor-c72f0cd5c77ffceb6f0275295c3446a908b17a75.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.0
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | changes/ticket30117 | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index bda1f323e5..ab7db2a928 100644 --- a/.travis.yml +++ b/.travis.yml @@ -216,7 +216,7 @@ script: ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes - - if [[ "$TEST_STEM" != "" ]]; then timelimit -p -t 540 -T 30 make src/app/tor test-stem; fi + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --log notice --target RUN_ALL; fi - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; 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 diff --git a/changes/ticket30117 b/changes/ticket30117 new file mode 100644 index 0000000000..5b6e6dabf7 --- /dev/null +++ b/changes/ticket30117 @@ -0,0 +1,4 @@ + o Testing (continuous integration): + - In Travis, tell timelimit to use stem's backtrace signals. And launch + python directly from timelimit, so python receives the signals from + timelimit, rather than make. Closes ticket 30117. |