Merge pull request #2923 from stapelberg/tests-split

Testsuite: avoid starting new i3 instances where possible

diff --git a/.travis.yml b/.travis.yml
index de9ff3fcd43874b14130c356ae7a0b5778935ee7..87c996fb53bc2c5c29684aa67d00e08ccc3655a1 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,6 @@ script:
   - ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME_UBUNTU} ./travis/debian-build.sh deb/ubuntu-amd64/DIST
   - ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME_386} linux32 ./travis/debian-build.sh deb/debian-i386/DIST
   - ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME_UBUNTU_386} linux32 ./travis/debian-build.sh deb/ubuntu-i386/DIST
-  - ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/clang-analyze.sh
   - ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/docs.sh
   - ./travis/skip-pkg.sh || travis/prep-bintray.sh
 

diff --git a/README.md b/README.md
new file mode 100644 (file)
index 0000000..21b2e24
--- /dev/null
+++ b/README.md
@@ -0,0 +1,12 @@
+![Logo](docs/logo-30.png) i3: A tiling window manager
+=====================================================
+
+[![Build Status](https://travis-ci.org/i3/i3.svg?branch=next)](https://travis-ci.org/i3/i3)
+[![Issue Stats](http://www.issuestats.com/github/i3/i3/badge/issue?style=flat)](http://www.issuestats.com/github/i3/i3)
+[![Pull Request Stats](http://www.issuestats.com/github/i3/i3/badge/pr?style=flat)](http://www.issuestats.com/github/i3/i3)
+
+i3 is a tiling window manager for X11.
+
+For more information about i3, please see [the project's website](https://i3wm.org/) and [online documentation](https://i3wm.org/docs/).
+
+For information about contributing to i3, please see [CONTRIBUTING.md](.github/CONTRIBUTING.md).

diff --git a/docs/testsuite b/docs/testsuite
index 795be0424fa477cf50d1e97b484881f37058d3c9..4fa3e9e1dcaf650a5273fab5a455d4a29320f679 100644 (file)
--- a/docs/testsuite
+++ b/docs/testsuite
@@ -75,7 +75,7 @@ used to install the testsuite. Many users prefer to use the more modern
 +cpanminus+ instead, though (because it asks no questions and just works):
 
 The tests additionally require +Xephyr(1)+ to run a nested X server. Install
-+xserver-xephyr+ on Debian or +xorg-xserver-xephyr+ on Arch Linux.
++xserver-xephyr+ on Debian or +xorg-server-xephyr+ on Arch Linux.
 
 .Installing testsuite dependencies using cpanminus (preferred)
 --------------------------------------------------------------------------------

diff --git a/libi3/font.c b/libi3/font.c
index 81091ea74a31da11d392864c1158ed387b0da1cd..aef8427b5396c3d8d9082308e64a30ea94dcec6e 100644 (file)
--- a/libi3/font.c
+++ b/libi3/font.c
@@ -105,7 +105,7 @@ static void draw_text_pango(const char *text, size_t text_len,
         pango_layout_set_text(layout, text, text_len);
 
     /* Do the drawing */
-    cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
     cairo_set_source_rgb(cr, pango_font_red, pango_font_green, pango_font_blue);
     pango_cairo_update_layout(cr, layout);
     pango_layout_get_pixel_size(layout, NULL, &height);

diff --git a/testcases/Makefile.PL b/testcases/Makefile.PL
index 0b1f305592a14e806bb5ae4920a1404ed05761f5..bf4e5dd70802c880b29f23e8c544b828df797e2b 100755 (executable)
--- a/testcases/Makefile.PL
+++ b/testcases/Makefile.PL
@@ -18,7 +18,11 @@ WriteMakefile(
     PM => {}, # do not install any files from this directory
     clean => {
         FILES => 'testsuite-* latest i3-cfg-for-*',
-    }
+    },
+    # This is a pure-Perl distribution:
+    linkext => {
+        LINKTYPE => '',
+    },
 );
 
 package MY;

diff --git a/travis/clang-analyze.sh b/travis/clang-analyze.sh
deleted file mode 100755 (executable)
index 5ef390d..0000000
--- a/travis/clang-analyze.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-
-mkdir -p deb/DIST-clang/build
-tar xf build/*.tar.bz2 -C deb/DIST-clang --strip-components=1
-(cd deb/DIST-clang/build && scan-build -o ../../CLANG ../configure && scan-build -o ../../CLANG --html-title="Analysis of i3 v$(git describe --tags)" make -j8)
-mv deb/CLANG/*/* deb/CLANG

diff --git a/travis/deploy-github-pages.sh b/travis/deploy-github-pages.sh
index f86fbf22eff19d778cae8ac767e43870a548a871..2d4548208b73a13b82370a71ec871173349306b7 100755 (executable)
--- a/travis/deploy-github-pages.sh
+++ b/travis/deploy-github-pages.sh
@@ -6,7 +6,6 @@ set -x
 GITVERSION=$(git describe --tags)
 
 mkdir build.i3wm.org
-cp -r deb/CLANG build.i3wm.org/clang-analyze
 cp -r deb/COPY-DOCS build.i3wm.org/docs
 cd build.i3wm.org
 echo build.i3wm.org > CNAME