From 8884c82c8614100fab0e0aba09083e2c3baa43e9 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Thu, 31 Mar 2016 12:34:55 +0200
Subject: [PATCH 2/2] CI: Use make check instead of make-check-wrap

make-check-wrap had to be used due to missing LOG_COMPILER
on rhel6 which is enabled with parallel test harness
---
 contrib/ci/run | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/contrib/ci/run b/contrib/ci/run
index 3fbf2c51fc16f9adc31e75948a3697f2e9207db0..2f42380afd6df2d98a262be7e4ef6d653a0ae032 100755
--- a/contrib/ci/run
+++ b/contrib/ci/run
@@ -201,21 +201,22 @@ function build_debug()
                                 --with-test-dir="$test_dir"
 
     # Not building "tests" due to https://fedorahosted.org/sssd/ticket/2350
-    stage make-tests        make-check-wrap -j $CPU_NUM check -- true
+    stage make-tests        make -j $CPU_NUM check
 
     status=0
     CK_FORK=no \
         stage make-check-valgrind \
-                make-check-wrap -j $CPU_NUM check -- \
-                                libtool --mode=execute \
-                                    valgrind-condense 99 \
-                                    "$valgrind_test_pattern" -- \
-                                    --trace-children=yes \
-                                    --trace-children-skip='*/bin/*,*/sbin/*' \
-                                    --leak-check=full \
-                                    --gen-suppressions=all \
-                                    --suppressions="$CI_DIR/sssd.supp" \
-                                    --verbose ||
+                make -j $CPU_NUM check -- \
+                     LOG_COMPILER=libtool \
+                     LOG_FLAGS="--mode=execute \
+                                valgrind-condense 99 \
+                                \"$valgrind_test_pattern\" -- \
+                                --trace-children=yes \
+                                --trace-children-skip='*/bin/*,*/sbin/*' \
+                                --leak-check=full \
+                                --gen-suppressions=all \
+                                --suppressions=\"$CI_DIR/sssd.supp\" \
+                                --verbose" ||
             status=$?
     mv "$test_dir" ci-test-dir
     ((status == 0))
@@ -279,7 +280,7 @@ function build_coverage()
 
     # Build everything, including tests
     # Not building "tests" due to https://fedorahosted.org/sssd/ticket/2350
-    stage make-tests        make-check-wrap -j $CPU_NUM check -- true
+    stage make-tests        make -j $CPU_NUM check
 
     stage lcov-pre          lcov --capture --initial --directory . \
                                  --base-directory "$BASE_DIR" \
-- 
2.7.3