aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2019-02-14 12:07:49 +0100
committerPeter Wu <peter@lekensteyn.nl>2019-02-15 10:02:01 +0000
commite6904308d3652e082b5499987626bd03a7908d1a (patch)
tree0ff0148f1b4faa9d0a6b5a769923417795457fd5 /.travis.yml
parent45f55ad8acc89f2090b707e133ae7555c4237973 (diff)
travis: fold msbuild output to remain below the 10k line limit
Fold messages by overwriting the same line via a carriage return), similar to Ninja. The full log will still contain all messages. Change-Id: I89cc7d10147ebd21f22d40c8d2c4481b1dd2ab56 Reviewed-on: https://code.wireshark.org/review/32024 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 4163adafd7..238dad764e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -112,9 +112,10 @@ before_script:
script:
# Enable parallelism for msbuild too (since CMake 3.12; ninja does not need it)
- export CMAKE_BUILD_PARALLEL_LEVEL=0
+ - if [ "$TRAVIS_OS_NAME" == "windows" ]; then build_filter=../tools/filter-msbuild.py; else build_filter=cat; fi
# Invoke ninja (Linux/macOS, --config is ignored) or msbuild (Windows)
- - cmake --build . --config RelWithDebInfo
- - cmake --build . --config RelWithDebInfo --target test-programs
+ - cmake --build . --config RelWithDebInfo | $build_filter
+ - cmake --build . --config RelWithDebInfo --target test-programs | $build_filter
- if [ "$PCAP" = "OFF" ]; then export PYTEST_ADDOPTS=--skip-missing-programs=dumpcap,rawshark; fi
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$PCAP" = "ON" ]; then sudo setcap "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" run/dumpcap; fi
- pytest