diff options
author | Michael Stapelberg <michael@stapelberg.de> | 2016-10-16 18:03:09 +0200 |
---|---|---|
committer | Michael Stapelberg <michael@stapelberg.de> | 2016-10-23 21:09:24 +0200 |
commit | ca98c7e614c35c64cf717eaa95ebe9dafa5b02c1 (patch) | |
tree | c5d8706b1cd6d5c095f4f6b8489220c218f2a9b9 /travis | |
parent | 05e5901bcae1ceaec435936f0c056886ac3ed12d (diff) | |
download | i3-ca98c7e614c35c64cf717eaa95ebe9dafa5b02c1.tar.gz i3-ca98c7e614c35c64cf717eaa95ebe9dafa5b02c1.zip |
Update travis for autotools
Diffstat (limited to 'travis')
-rwxr-xr-x | travis/check-spelling.pl | 16 | ||||
-rwxr-xr-x | travis/clang-analyze.sh | 4 | ||||
-rwxr-xr-x | travis/debian-build.sh | 9 | ||||
-rwxr-xr-x | travis/run-tests.sh | 6 |
4 files changed, 19 insertions, 16 deletions
diff --git a/travis/check-spelling.pl b/travis/check-spelling.pl index 71feec31..6d070136 100755 --- a/travis/check-spelling.pl +++ b/travis/check-spelling.pl @@ -29,13 +29,13 @@ my $binary_spelling_exceptions = { 'betwen' => 1, # asan_flags.inc contains this spelling error. }; my @binaries = qw( - i3 - i3-config-wizard/i3-config-wizard - i3-dump-log/i3-dump-log - i3-input/i3-input - i3-msg/i3-msg - i3-nagbar/i3-nagbar - i3bar/i3bar + build/i3 + build/i3-config-wizard/i3-config-wizard + build/i3-dump-log/i3-dump-log + build/i3-input/i3-input + build/i3-msg/i3-msg + build/i3-nagbar/i3-nagbar + build/i3bar/i3bar ); for my $binary (@binaries) { check_spelling(slurp($binary), $binary_spelling_exceptions, sub { @@ -50,7 +50,7 @@ for my $binary (@binaries) { my $manpage_spelling_exceptions = { }; -for my $name (glob('man/*.1')) { +for my $name (glob('build/man/*.1')) { for my $line (split(/\n/, slurp($name))) { next if $line =~ /^\.\\\"/o; check_spelling($line, $manpage_spelling_exceptions, sub { diff --git a/travis/clang-analyze.sh b/travis/clang-analyze.sh index 05d54119..97c11fcc 100755 --- a/travis/clang-analyze.sh +++ b/travis/clang-analyze.sh @@ -3,7 +3,7 @@ set -e set -x -mkdir -p deb/DIST-clang +mkdir -p deb/DIST-clang/build tar xf *.tar.bz2 -C deb/DIST-clang --strip-components=1 -(cd deb/DIST-clang && scan-build -o ../CLANG --html-title="Analysis of i3 v$(git describe --tags)" make -j8) +(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/debian-build.sh b/travis/debian-build.sh index 655bd5c4..9ce5a5af 100755 --- a/travis/debian-build.sh +++ b/travis/debian-build.sh @@ -5,12 +5,15 @@ set -x DEST=$1 -make store_git_version -make dist +mkdir -p build +cd build +../configure +make echo-version > ../I3_VERSION +make dist-bzip2 # unpack dist tarball mkdir -p "${DEST}" tar xf *.tar.bz2 -C "${DEST}" --strip-components=1 -cp -r debian "${DEST}" +cp -r ../debian "${DEST}" sed -i '/^\s*libxcb-xrm-dev/d' deb/ubuntu-*/DIST/debian/control || true cd "${DEST}" debchange -m -l+g$(git describe --tags) 'Automatically built' diff --git a/travis/run-tests.sh b/travis/run-tests.sh index d8a40d77..44df81d2 100755 --- a/travis/run-tests.sh +++ b/travis/run-tests.sh @@ -3,7 +3,7 @@ set -e set -x -cd testcases +cd build # TODO: remove this workaround once https://bugs.debian.org/836723 is fixed # Found at https://llvm.org/bugs/show_bug.cgi?id=27310#c8: @@ -26,7 +26,7 @@ fi # Try running the tests in parallel so that the common case (tests pass) is # quick, but fall back to running them in sequence to make debugging easier. -if ! xvfb-run ./complete-run.pl +if ! xvfb-run make check then - xvfb-run ./complete-run.pl --parallel=1 || (cat latest/complete-run.log; false) + xvfb-run ./testcases/complete-run.pl --parallel=1 || (cat latest/complete-run.log; false) fi |