summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2019-08-01 12:14:15 -0700
committerEric Anholt <eric@anholt.net>2019-08-13 10:30:01 -0700
commitab49873b4422eb087b6257265e30799ce8d4728d (patch)
treee2162a29f74047975721ad153e7efb0391edb6a8
parent9605749f995b3a7b1d94d71994cdc57b9d0bfdff (diff)
gitlab-ci: Switch the meson-main build type to debugoptimized.
Now that we're running the drivers we build, building with optimization is important for keeping our runtime down. Shaves about 4 minutes of runtime off of GLES2 CTS of llvmpipe at 64x64. v2: Only switch meson-main until we enable CTS for other builds on request by Michel. Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
-rw-r--r--.gitlab-ci.yml1
-rwxr-xr-x.gitlab-ci/meson-build.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9861f7590f45..aca5d7624d08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -175,6 +175,7 @@ meson-main:
-D osmesa=gallium
-D tools=all
MESON_SHADERDB: "true"
+ BUILDTYPE: "debugoptimized"
meson-clover:
extends: .meson-build
diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh
index 42aed0e91c51..c2efd2aeedf5 100755
--- a/.gitlab-ci/meson-build.sh
+++ b/.gitlab-ci/meson-build.sh
@@ -19,7 +19,7 @@ meson _build --native-file=native.file \
${CROSS+--cross /cross_file-$CROSS.txt} \
-D prefix=`pwd`/install \
-D libdir=lib \
- -D buildtype=debug \
+ -D buildtype=${BUILDTYPE:-debug} \
-D build-tests=true \
-D libunwind=${UNWIND} \
${DRI_LOADERS} \