From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Mon, 30 Jul 2018 11:28:26 +0000 (+0200)
Subject: simplify autotests
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~154^2^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=24dda24841123fd7ca36944242fbccbf2488ce00;p=zchunk.git

simplify autotests

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---

diff --git a/autotest/centos-latest/Dockerfile b/autotest/centos-latest/Dockerfile
index 16ce7d0..037e2ff 100644
--- a/autotest/centos-latest/Dockerfile
+++ b/autotest/centos-latest/Dockerfile
@@ -4,6 +4,5 @@ WORKDIR /code
 RUN yum -y install epel-release
 RUN yum -y update epel-release
 RUN yum -y install meson gcc "pkgconfig(libzstd)" "pkgconfig(libcurl)" "pkgconfig(openssl)"
-RUN meson build
-RUN /bin/bash -c 'cd build; ninja-build'
-RUN /bin/bash -c 'cd build; ninja-build test'
+RUN meson build --auto-features=enabled
+RUN ninja-build -C build test
diff --git a/autotest/debian-latest/Dockerfile b/autotest/debian-latest/Dockerfile
index 350d349..545ab1f 100644
--- a/autotest/debian-latest/Dockerfile
+++ b/autotest/debian-latest/Dockerfile
@@ -3,6 +3,5 @@ ADD ./ /code
 WORKDIR /code
 RUN apt-get update
 RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -yq install meson gcc pkg-config libzstd-dev libcurl4-openssl-dev libssl-dev'
-RUN meson build
-RUN /bin/bash -c 'cd build; ninja'
-RUN /bin/bash -c 'cd build; ninja test'
+RUN meson build --auto-features=enabled
+RUN ninja -C build test
diff --git a/autotest/fedora-latest/Dockerfile b/autotest/fedora-latest/Dockerfile
index c81680c..435113e 100644
--- a/autotest/fedora-latest/Dockerfile
+++ b/autotest/fedora-latest/Dockerfile
@@ -2,6 +2,5 @@ FROM fedora:latest
 ADD ./ /code
 WORKDIR /code
 RUN dnf -y install meson gcc "pkgconfig(libzstd)" "pkgconfig(libcurl)" "pkgconfig(openssl)"
-RUN meson build
-RUN /bin/bash -c 'cd build; ninja'
-RUN /bin/bash -c 'cd build; ninja test'
+RUN meson build --auto-features=enabled
+RUN ninja -C build test
diff --git a/autotest/opensuse-leap/Dockerfile b/autotest/opensuse-leap/Dockerfile
index ea6d3f0..4bf3a71 100644
--- a/autotest/opensuse-leap/Dockerfile
+++ b/autotest/opensuse-leap/Dockerfile
@@ -2,6 +2,5 @@ FROM opensuse/leap
 ADD ./ /code
 WORKDIR /code
 RUN zypper --non-interactive install meson gcc pkgconfig "pkgconfig(libzstd)" "pkgconfig(libcurl)" "pkgconfig(openssl)"
-RUN meson build
-RUN /bin/bash -c 'cd build; ninja'
-RUN /bin/bash -c 'cd build; ninja test'
+RUN meson build --auto-features=enabled
+RUN ninja -C build test
diff --git a/autotest/ubuntu-rolling/Dockerfile b/autotest/ubuntu-rolling/Dockerfile
index 4b62c58..a1c8366 100644
--- a/autotest/ubuntu-rolling/Dockerfile
+++ b/autotest/ubuntu-rolling/Dockerfile
@@ -3,6 +3,5 @@ ADD ./ /code
 WORKDIR /code
 RUN apt-get update
 RUN /bin/bash -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -yq install meson gcc pkg-config libzstd-dev libcurl4-openssl-dev libssl-dev'
-RUN meson build
-RUN /bin/bash -c 'cd build; ninja'
-RUN /bin/bash -c 'cd build; ninja test'
+RUN meson build --auto-features
+RUN ninja -C build test