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

Reviewed-by: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>

2 files changed, 13 insertions, 64 deletions

diff --git a/contrib/ci/make-check-wrap b/contrib/ci/make-check-wrap
deleted file mode 100755
index 4ad323e5f..000000000
--- a/contrib/ci/make-check-wrap
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-#
-# Build a make check target, prepending test commands with specified command
-# and arguments.
-# Args: [make_arg...] [-- wrap_cmd wrap_arg...]
-#
-# Copyright (C) 2014 Red Hat
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-set -o nounset -o pipefail -o errexit
-
-declare -a argv=("make")
-declare arg
-
-while [ $# != 0 ]; do
-    arg="$1"
-    shift
-    if [ "$arg" == "--" ]; then
-        break
-    fi
-    argv+=("$arg")
-done
-
-if [ $# != 0 ]; then
-    # If Makefile supports LOG_COMPILER
-    if grep -q -w LOG_COMPILER Makefile; then
-        printf -v arg 'LOG_COMPILER=%q' $1
-        argv+=("$arg")
-        shift
-        if [ $# != 0 ]; then
-            printf -v arg ' %q' "$@"
-            argv+=("LOG_FLAGS=$arg")
-        fi
-    else
-        printf -v arg ' %q' "$@"
-        argv+=("AUX_TESTS_ENVIRONMENT=$arg")
-    fi
-fi
-
-"${argv[@]}"
diff --git a/contrib/ci/run b/contrib/ci/run
index 3fbf2c51f..3c8f502f8 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 LOG_COMPILER=true
 
     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 LOG_COMPILER=true
 
     stage lcov-pre          lcov --capture --initial --directory . \
                                  --base-directory "$BASE_DIR" \