.travis.yml: Use meson for building

9 files changed, 82 insertions, 18 deletions

diff --git a/.travis/autotools/after_failure.sh b/.travis/autotools/after_failure.sh
new file mode 100644
index 0000000..9d65133
--- /dev/null
+++ b/.travis/autotools/after_failure.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && cat test-suite.log"
diff --git a/.travis/autotools/after_success.sh b/.travis/autotools/after_success.sh
new file mode 100644
index 0000000..6c648a2
--- /dev/null
+++ b/.travis/autotools/after_success.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if test x"$COVERAGE" = xyes; then
+  # docker exec $CONTAINER pip install cpp-coveralls
+
+  # manually install cpp-coveralls until the gcov fix has been
+  # incorporated in the pip version
+  docker exec $CONTAINER sh -c "cd /tmp && rm -rf cpp-coveralls && git clone -q https://github.com/eddyxu/cpp-coveralls && cd cpp-coveralls && python setup.py build && python setup.py install"
+  docker exec \
+	 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" \
+	 -e TRAVIS_BRANCH="$TRAVIS_BRANCH" \
+	 $CONTAINER sh -c "cd $BUILDDIR && cpp-coveralls -b $BUILDDIR -E '(^|.*/)(frob|mock|test)-.*|(^|.*/)(virtual-fixed-generated\.h)' --gcov-options '\-lp'"
+fi
diff --git a/.travis/autotools/before_install.sh b/.travis/autotools/before_install.sh
new file mode 100644
index 0000000..454b9eb
--- /dev/null
+++ b/.travis/autotools/before_install.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+docker pull fedora
+export CONTAINER=$(docker run -d fedora sleep 1800)
+
+docker exec $CONTAINER dnf -y install 'dnf-command(builddep)'
+docker exec $CONTAINER dnf -y builddep p11-kit
+docker exec $CONTAINER dnf -y install gettext-devel git libtool make opensc openssl valgrind $EXTRA_PKGS
+docker exec $CONTAINER useradd user
diff --git a/.travis/autotools/install.sh b/.travis/autotools/install.sh
new file mode 100644
index 0000000..a7257d0
--- /dev/null
+++ b/.travis/autotools/install.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+docker cp . $CONTAINER:/srcdir
+docker exec $CONTAINER cp -R /srcdir /coverage
+docker exec $CONTAINER mkdir /builddir
+docker exec $CONTAINER chown -R user /builddir
+docker exec $CONTAINER mkdir /installdir
+docker exec $CONTAINER mkdir -p /installdir/etc/pki/ca-trust-source
+docker exec $CONTAINER mkdir -p /installdir/share/pki/ca-trust-source
+docker exec $CONTAINER chown -R user /installdir
+# FIXME: This is needed because some files are included in distribution
+# and need to be generated in $srcdir rather than $builddir
+docker exec $CONTAINER chown -R user /srcdir
+docker exec $CONTAINER chown -R user /coverage
diff --git a/.travis/autotools/script.sh b/.travis/autotools/script.sh
new file mode 100644
index 0000000..c8ad2e3
--- /dev/null
+++ b/.travis/autotools/script.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+docker exec $CONTAINER sh -c "cd $SRCDIR && NOCONFIGURE=1 ./autogen.sh"
+docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && $SRCDIR/configure --enable-strict --prefix=/installdir --libdir=/installdir/lib --sysconfdir=/installdir/etc --with-trust-paths=/installdir/etc/pki/ca-trust-source:/installdir/share/pki/ca-trust-source $BUILD_OPTS"
+if test -n "$PRELOAD_CMD"; then
+  P11_KIT_TEST_LD_PRELOAD=$(docker exec $CONTAINER su - user sh -c "$PRELOAD_CMD")
+fi
+docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && $SCAN_BUILD make -j$(nproc) V=1"
+docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && P11_KIT_DEBUG=all LSAN_OPTIONS="$LSAN_OPTIONS" P11_KIT_TEST_LD_PRELOAD=\"$P11_KIT_TEST_LD_PRELOAD\" make check -j$(nproc) V=1 $CHECK_OPTS"
+docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && make install"
+docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && make installcheck"
+docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && valgrind --error-exitcode=81 pkcs11-tool --module p11-kit-proxy.so -L; test $? != 81"
diff --git a/.travis/linux/after_failure.sh b/.travis/linux/after_failure.sh
index 9d65133..e060eb1 100644
--- a/.travis/linux/after_failure.sh
+++ b/.travis/linux/after_failure.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && cat test-suite.log"
+docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && cat meson-logs/testlog.txt"
diff --git a/.travis/linux/after_success.sh b/.travis/linux/after_success.sh
index 6c648a2..ff3d31c 100644
--- a/.travis/linux/after_success.sh
+++ b/.travis/linux/after_success.sh
@@ -1,13 +1,11 @@
 #!/bin/sh
 
-if test x"$COVERAGE" = xyes; then
-  # docker exec $CONTAINER pip install cpp-coveralls
+set +x
 
-  # manually install cpp-coveralls until the gcov fix has been
-  # incorporated in the pip version
-  docker exec $CONTAINER sh -c "cd /tmp && rm -rf cpp-coveralls && git clone -q https://github.com/eddyxu/cpp-coveralls && cd cpp-coveralls && python setup.py build && python setup.py install"
+if test x"$COVERAGE" = xyes; then
+  docker exec $CONTAINER su user sh -c "pip3 install --user cpp-coveralls"
   docker exec \
 	 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" \
 	 -e TRAVIS_BRANCH="$TRAVIS_BRANCH" \
-	 $CONTAINER sh -c "cd $BUILDDIR && cpp-coveralls -b $BUILDDIR -E '(^|.*/)(frob|mock|test)-.*|(^|.*/)(virtual-fixed-generated\.h)' --gcov-options '\-lp'"
+	 $CONTAINER su user sh -c "cd $SRCDIR && /home/user/.local/bin/cpp-coveralls -b $BUILDDIR -E '(^|.*/)(frob|mock|test)-.*|(^|.*/)(virtual-fixed-generated\.c)' --gcov-options '\-lp'"
 fi
diff --git a/.travis/linux/before_install.sh b/.travis/linux/before_install.sh
index 454b9eb..fb996d1 100644
--- a/.travis/linux/before_install.sh
+++ b/.travis/linux/before_install.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
+set -e
+
 docker pull fedora
 export CONTAINER=$(docker run -d fedora sleep 1800)
 
 docker exec $CONTAINER dnf -y install 'dnf-command(builddep)'
 docker exec $CONTAINER dnf -y builddep p11-kit
-docker exec $CONTAINER dnf -y install gettext-devel git libtool make opensc openssl valgrind $EXTRA_PKGS
+docker exec $CONTAINER dnf -y install gettext-devel git libtool make opensc openssl valgrind meson ninja-build $EXTRA_PKGS
 docker exec $CONTAINER useradd user
diff --git a/.travis/linux/script.sh b/.travis/linux/script.sh
index c8ad2e3..24d48be 100644
--- a/.travis/linux/script.sh
+++ b/.travis/linux/script.sh
@@ -1,12 +1,25 @@
 #!/bin/sh
 
-docker exec $CONTAINER sh -c "cd $SRCDIR && NOCONFIGURE=1 ./autogen.sh"
-docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && $SRCDIR/configure --enable-strict --prefix=/installdir --libdir=/installdir/lib --sysconfdir=/installdir/etc --with-trust-paths=/installdir/etc/pki/ca-trust-source:/installdir/share/pki/ca-trust-source $BUILD_OPTS"
-if test -n "$PRELOAD_CMD"; then
-  P11_KIT_TEST_LD_PRELOAD=$(docker exec $CONTAINER su - user sh -c "$PRELOAD_CMD")
-fi
-docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && $SCAN_BUILD make -j$(nproc) V=1"
-docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && P11_KIT_DEBUG=all LSAN_OPTIONS="$LSAN_OPTIONS" P11_KIT_TEST_LD_PRELOAD=\"$P11_KIT_TEST_LD_PRELOAD\" make check -j$(nproc) V=1 $CHECK_OPTS"
-docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && make install"
-docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && make installcheck"
-docker exec $CONTAINER su - user sh -c "cd $BUILDDIR && valgrind --error-exitcode=81 pkcs11-tool --module p11-kit-proxy.so -L; test $? != 81"
+docker exec $CONTAINER su - user sh -c "cd $SRCDIR && meson $BUILDDIR -Dstrict=true -Dprefix=/installdir -Dlibdir=/installdir/lib -Dsysconfdir=/installdir/etc -Dtrust-paths=/installdir/etc/pki/ca-trust-source:/installdir/share/pki/ca-trust-source $MESON_BUILD_OPTS"
+if test $? -ne 0; then
+  exit 1
+fi
+
+if test -n "$SCAN_BUILD"; then
+    docker exec $CONTAINER su - user sh -c "cd $SRCDIR && SCAN_BUILD='$SCAN_BUILD' ninja scan-build -C $BUILDDIR"
+else
+    docker exec $CONTAINER su - user sh -c "cd $SRCDIR && ninja -C $BUILDDIR"
+fi
+if test $? -ne 0; then
+  exit 1
+fi
+
+docker exec $CONTAINER su - user sh -c "cd $SRCDIR && P11_KIT_DEBUG=all $MESON_TEST_ENV meson test -C $BUILDDIR $MESON_TEST_OPTS || cat $BUILDDIR/meson-logs/testlog.txt"
+if test $? -ne 0; then
+  exit 1
+fi
+
+docker exec $CONTAINER su - user sh -c "cd $SRCDIR && ninja -C $BUILDDIR install"
+if test $? -ne 0; then
+  exit 1
+fi