Mesa (master): travis: fix scons build after deprecation warning

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Oct 29 09:25:55 UTC 2019


Module: Mesa
Branch: master
Commit: 690d359b6f4947e65f0a060480c1394aaa862df0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=690d359b6f4947e65f0a060480c1394aaa862df0

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Tue Oct 29 09:24:36 2019 +0000

travis: fix scons build after deprecation warning

Fixes: 54053bc8d0dad89a38e2 ("scons: Print a deprecation warning about using scons on not windows")
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>

---

 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 23cb24fac16..6528b104667 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,6 +58,6 @@ script:
       ninja -C _build install || travis_terminate 1;
     fi
   - if test "x$BUILD" = xscons; then
-      scons || travis_terminate 1;
-      scons check || travis_terminate 1;
+      scons force_scons=1 || travis_terminate 1;
+      scons force_scons=1 check || travis_terminate 1;
     fi




More information about the mesa-commit mailing list