Cleaned up the CI flow

.travis.yml

@@ -44,9 +44,9 @@ install:
   - pip3 install --user meson
 
 script:
-  - meson -Db_coverage=true -Dwith_doc=false build
+  - meson -Db_coverage=true build
   - ninja -C build
-  - mesontest -C build --print-errorlogs
+  - meson test -C build --print-errorlogs
   - docker build -t b6b -f Dockerfile .
   - docker run -w /root b6b ./ci_build.sh
 
@@ -60,6 +60,6 @@ addons:
       name: "dimkr/b6b"
       description: "Build submitted via Travis CI"
     notification_email: dima@dimakrasner.com
-    build_command_prepend: "meson -Dwith_doc=false build-coverity"
+    build_command_prepend: "meson build-coverity"
     build_command:  "ninja -C build-coverity"
     branch_pattern: master

Dockerfile

@@ -21,7 +21,7 @@ ENV LANG en_US.UTF-8
 
 RUN sed -i s/^deb.*multiverse.*/\#\&/g /etc/apt/sources.list
 RUN apt-get -qq update
-RUN apt-get -y --no-install-recommends install gcc clang ninja-build locales python3-pip python3-setuptools python3-wheel libffi-dev valgrind asciidoc
+RUN apt-get -y --no-install-recommends install gcc clang ninja-build locales python3-pip python3-setuptools python3-wheel libffi-dev valgrind
 RUN locale-gen --lang en_US.UTF-8
 RUN pip3 install meson
 

ci_build.sh

@@ -43,7 +43,7 @@ for i in build build-clang
 do
 	meson test -C $i --no-rebuild --print-errorlogs --repeat 5
 	meson test -C $i --no-rebuild --print-errorlogs --repeat 5 --wrapper "taskset -c 0"
-	meson test -C $i --no-rebuild --print-errorlogs --no-suite=b6b:slow --num-processes 1 -t 2 --wrapper "valgrind --leak-check=full --malloc-fill=1 --free-fill=1 --track-fds=yes"
-	meson test -C $i --no-rebuild --print-errorlogs --no-suite=b6b:slow --num-processes 1 -t 2 --wrapper "valgrind --tool=helgrind"
-	meson test -C $i --no-rebuild --print-errorlogs --no-suite=b6b:slow --num-processes 1 -t 2 --wrapper "valgrind --tool=helgrind --fair-sched=yes"
+	meson test -C $i --no-rebuild --print-errorlogs --no-suite=b6b:slow --num-processes 1 -t 2 --wrapper "valgrind --leak-check=full --error-exitcode=1 --malloc-fill=1 --free-fill=1 --track-fds=yes"
+	meson test -C $i --no-rebuild --print-errorlogs --no-suite=b6b:slow --num-processes 1 -t 2 --wrapper "valgrind --tool=helgrind --error-exitcode=1"
+	meson test -C $i --no-rebuild --print-errorlogs --no-suite=b6b:slow --num-processes 1 -t 2 --wrapper "valgrind --tool=helgrind --error-exitcode=1 --fair-sched=yes"
 done

meson_options.txt

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 option('with_threads', type: 'boolean')
-option('with_doc', type: 'boolean')
 option('with_miniz', type: 'boolean')
 option('with_linenoise', type: 'boolean')
 option('with_valgrind', type: 'boolean', value: false)