From b2e047f0d6504501c6ae330e6486d8f53841229e Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Tue, 10 Jan 2017 19:32:18 +0000
Subject: [PATCH] travis: run looping_threads.test under valgrind

---
 .travis.yml               | 58 ++++-----------------------------------
 ci/run-build-and-tests.sh |  5 ++--
 2 files changed, 9 insertions(+), 54 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2874c5dd..ea25858a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ dist: trusty
 
 before_install: ci/install-dependencies.sh
 
-script: ci/run-build-and-tests.sh
+script: travis_wait 60 ci/run-build-and-tests.sh
 
 sudo: required
 
@@ -22,54 +22,8 @@ matrix:
       env:
         - TARGET=x86_64
         - STACKTRACE=libunwind
-        - CHECK=coverage
-        - KHEADERS=torvalds/linux
-    - compiler: gcc-8
-      env:
-        - TARGET=x86_64
-        - STACKTRACE=libunwind
-        - KHEADERS=torvalds/linux
-    - compiler: gcc
-      env:
-        - TARGET=x86_64
-        - STACKTRACE=libunwind
-    - compiler: gcc
-      env:
-        - TARGET=x32
-        - STACKTRACE=no
-    - compiler: gcc
-      env:
-        - TARGET=x86
-        - STACKTRACE=no
-    - compiler: clang
-      env:
-        - TARGET=x86_64
-        - STACKTRACE=libunwind
-    - compiler: musl-gcc
-      env:
-        - TARGET=x86_64
-        - STACKTRACE=no
-    - compiler: clang
-      env:
-        - TARGET=x86
-        - STACKTRACE=no
-    - compiler: musl-gcc
-      env:
-        - TARGET=x86
-        - STACKTRACE=no
-    - compiler: gcc-8
-      env:
-        - TARGET=x86_64
-        - STACKTRACE=libunwind
-    - compiler: gcc-8
-      env:
-        - TARGET=x32
-        - STACKTRACE=no
-    - compiler: gcc-8
-      env:
-        - TARGET=x86
-        - STACKTRACE=no
-    - compiler: gcc
-      env:
-        - TARGET=x86_64
-        - STACKTRACE=no
+        - CHECK=valgrind
+        - TIMEOUT_DURATION=1200
+        - VALGRIND_TOOLS=memcheck
+        - VALGRIND_TESTDIR=tests
+        - VALGRIND_TESTS=looping_threads.test
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 3699ab09..24f0f899 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -97,11 +97,12 @@ case "${CHECK-}" in
 		rc=$?
 		for n in ${VALGRIND_TOOLS:-memcheck helgrind drd}; do
 			make -k $j -C "${VALGRIND_TESTDIR:-.}" \
-				check-valgrind-$n VERBOSE=${VERBOSE-} ||
+				check-valgrind-$n V=1 VERBOSE=${VERBOSE-} \
+					${VALGRIND_TESTS:+TESTS="$VALGRIND_TESTS"} ||
 					rc=$?
 		done
 		echo 'BEGIN OF TEST SUITE INFORMATION'
-		tail -n 99999 -- tests*/test-suite*.log tests*/ksysent.log ||
+		tail -n 99999 -- tests*/test-suite*.log ||
 			rc=$?
 		echo 'END OF TEST SUITE INFORMATION'
 		[ "$rc" -eq 0 ]