summaryrefslogtreecommitdiff
path: root/.travis/linux/script.sh
diff options
context:
space:
mode:
authorDaiki Ueno <dueno@redhat.com>2019-06-02 10:28:53 +0200
committerDaiki Ueno <ueno@gnu.org>2019-06-18 14:17:28 +0200
commitdaf1a84de39c4cdbd308c6a0b80b437689a222c7 (patch)
tree1ce89f4a8ecc74fb718825ebd94e80cbe0e1816b /.travis/linux/script.sh
parent4f956698b64ac6eb8e5e8b7d143ceb11f1133814 (diff)
.travis.yml: Use meson for building
Diffstat (limited to '.travis/linux/script.sh')
-rw-r--r--.travis/linux/script.sh33
1 files changed, 23 insertions, 10 deletions
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