summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2018-03-14 13:13:54 -0400
committerAdam Jackson <ajax@redhat.com>2018-03-14 15:08:34 -0400
commit1ca092f990e67c7dccf5790a72c41e84711c28a8 (patch)
tree57255a5cb255dbec00524f24ec63953c9a2ccc47 /test
parent17d30369f4445e1693a1b75dc6620bbc21ec8e61 (diff)
travis: Switch linux build from stretch to rawhide
Stretch's Mesa is too far behind, and building Mesa to build xserver is not the sort of problem we're trying to solve here. But our Travis scripts run inside a docker image, and that image can be whatever, so since I have to keep rawhide building anyway let's switch to that for now. The dockerfile can be found at: https://github.com/nwnk/xserver-travis The $DISTRO part of the change is foreshadowing for the day we readd a (probably sid-based) debian image; patches for other environments are welcome. Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'test')
-rwxr-xr-xtest/scripts/build-travis-deps.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/scripts/build-travis-deps.sh b/test/scripts/build-travis-deps.sh
index b87c65d3e..42837c2c8 100755
--- a/test/scripts/build-travis-deps.sh
+++ b/test/scripts/build-travis-deps.sh
@@ -6,7 +6,9 @@ export PIGLIT_DIR=$TRAVIS_BUILD_DIR/piglit
export XTEST_DIR=$TRAVIS_BUILD_DIR/xtest
set -e
+set -x
-meson --prefix=/usr build/
+meson setup build/
+meson configure -Dprefix=$PREFIX build/
ninja -C build/ install
ninja -C build/ test