File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ anchors:
3232 sources :
3333 # Need msgfmt 0.19.8 to be able to generate .desktop files
3434 - sourceline : ' ppa:ricotz/toolchain'
35- packages :
35+ packages : &linux-packages
3636 - autoconf
3737 - clang
3838 - lcov
@@ -73,9 +73,13 @@ anchors:
7373 fi
7474 before_script :
7575 # Start virtual framebuffer to be able to test the GUI. Does not work on OS X.
76- - export DISPLAY=:99.0
77- - sh -e /etc/init.d/xvfb start && sleep 3
78- - sudo modprobe snd-dummy
76+ - |
77+ if [[ "${TEST}" =~ gui ]]; then
78+ export DISPLAY=:99.0
79+ sh -e /etc/init.d/xvfb start && sleep 3
80+ fi
81+ - |
82+ [ "${TRAVIS_CPU_ARCH}" = s390x ] || sudo modprobe snd-dummy
7983 - sudo usermod -a -G audio $USER
8084 - do_test() { sg audio "sg $(id -gn) '$*'"; }
8185
@@ -201,6 +205,17 @@ matrix:
201205 env :
202206 - *normal
203207 - *shadowopt
208+ - << : *linux
209+ arch : s390x
210+ name : huge/gcc-s390x
211+ compiler : gcc
212+ env :
213+ - *linux-huge
214+ addons :
215+ apt :
216+ packages :
217+ - *linux-packages
218+ - libtool-bin
204219 - << : *linux
205220 name : huge+coverage/clang
206221 compiler : clang
Original file line number Diff line number Diff line change @@ -738,6 +738,8 @@ static char *(features[]) =
738738
739739static int included_patches [] =
740740{ /* Add new patch number below this line */
741+ /**/
742+ 377 ,
741743/**/
742744 376 ,
743745/**/
You can’t perform that action at this time.
0 commit comments