summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2014-03-12 14:13:51 +0000
committerMichael Tokarev <mjt@tls.msk.ru>2014-03-15 13:54:18 +0400
commit86c3b20a5f654ae444ba6bd1a7b0516e0a17541d (patch)
tree044731bb775ede782ff2948090daf40727b41e17
parent6d585ca55999aec2bcfcbf04c3cbecbb952b7302 (diff)
downloadqemu-86c3b20a5f654ae444ba6bd1a7b0516e0a17541d.zip
.travis.yml: re-enable lttng user space trace test
This build was disabled while the lttng tracing was broken. Stefan has recently submitted a pull request with it re-enabled. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--.travis.yml9
1 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 286cf6210f..1d7842102c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,8 +69,7 @@ matrix:
EXTRA_CONFIG="--enable-trace-backend=ftrace"
TEST_CMD=""
compiler: gcc
- # This disabled make check for the ftrace backend which needs more setting up
- # Currently broken on 12.04 due to mis-packaged liburcu and changed API, will be pulled.
- #- env: TARGETS=i386-softmmu,x86_64-softmmu
- # EXTRA_PKGS="liblttng-ust-dev liburcu-dev"
- # EXTRA_CONFIG="--enable-trace-backend=ust"
+ - env: TARGETS=i386-softmmu,x86_64-softmmu
+ EXTRA_PKGS="liblttng-ust-dev liburcu-dev"
+ EXTRA_CONFIG="--enable-trace-backend=ust"
+ compiler: gcc