From patchwork Mon Jan 15 00:00:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 124454 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp504256lje; Sun, 14 Jan 2018 16:10:11 -0800 (PST) X-Google-Smtp-Source: ACJfBou+SBf5f4dy7AsPZtDARW9rMCVVcWDe1mP7AgtOt/EVsIQN4bqqGQjmZnBnWFOhB7BL0Jz/ X-Received: by 10.237.44.98 with SMTP id f89mr3914477qtd.94.1515975011693; Sun, 14 Jan 2018 16:10:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515975011; cv=none; d=google.com; s=arc-20160816; b=NxPYQnQedLEcyuMucvg+buY8FYNT5jfzhPvUqp7rr40kYMmGY5muUY8+CE7RRTDz1Y vgN34U2q+nFzopmnPj07vpwJqB1HDUgLUIliPxF5Mg9A1Fc+yq+YmVqJ3F6geBcY2L1E wk28rqBI+YDETuyVPTJa5GV74C5NoGEDunhHFznHU4wQ80E91fNiI2Wtxui9rQdOUNYB /omMIixnb+BZSTTNZbBEKETruiPjyh2lx9Hqaj0rQs9ewyExJwnX7fuDZfsv2mZEnsRy mClMxw15ISmyqswuJgUwa0L7LdQT0VeDQ9HtGyQ5HnFQj763d6q7sQLtyAKCvmBtDQ0L JV/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=qVsXjAcWxLUGD2Pxtxm08ZPh0mIPYBCLwf9E+bmu1c8=; b=L+Wh3zJtQPGzA0zvOe/ZmkTKq517ifaguj5XFkHOH5YSkeXcwB/x+NiPK6P8OPCjHg aj3raMig/QEqQFXO3dhhTuCNS51NF/cmi/vt1Cyml7dA1uu3xhfxxLVJG4Qg9PwLBbLq ilPkOFhiVoJwhGT1Z8Ro22RKWWvrDar+LyztUHEXH3bazFmAezf3OyOSGIphCXCrt/k7 ygIGb5QdY89O1bx3WuzOP3+pXAWn37qAehDx2IH73ok4PK5kOL2uiqpQ66JCKNRy0CUn HCDKesngv6BxdSfcYMbNGsS/1r/+yR1wnO+G9loQfyKbEuhW4y5PRF48ZAMLAk8gxQxC nGSA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id h129si4543547qkf.410.2018.01.14.16.10.11; Sun, 14 Jan 2018 16:10:11 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 61EBC60BF4; Mon, 15 Jan 2018 00:10:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 3B2916175F; Mon, 15 Jan 2018 00:04:31 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6408C61754; Mon, 15 Jan 2018 00:04:25 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 4019161754 for ; Mon, 15 Jan 2018 00:02:42 +0000 (UTC) Received: from mxback11j.mail.yandex.net (mxback11j.mail.yandex.net [IPv6:2a02:6b8:0:1619::84]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 1019B183026 for ; Mon, 15 Jan 2018 03:02:41 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback11j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id SR6fJO8Gvo-2fJ0Y8cB; Mon, 15 Jan 2018 03:02:41 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Qa6vHVk8Xh-2YeWpw0u; Mon, 15 Jan 2018 03:02:34 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 15 Jan 2018 03:00:09 +0300 Message-Id: <1515974412-25863-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> References: <1515974412-25863-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v12 11/14] Revert "test: time: do not fail under gcov" X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov This reverts commit 7a7e3ff9d50d67b7c79058db98ba27ab5a806437. After fixing time test to use clock_gettime() instead of clock(), this test should not fail under Travis/coverage. Reenable the test. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 377 (lumag:misc-fixes) ** https://github.com/Linaro/odp/pull/377 ** Patch: https://github.com/Linaro/odp/pull/377.patch ** Base sha: 634b380b63de53c65b92c214d91aaf03785d69db ** Merge commit sha: fc86778a31eef76e515fd1af33f169477c05bd43 **/ test/validation/api/Makefile.am | 2 +- test/validation/api/time/Makefile.am | 10 --------- test/validation/api/time/time.sh | 42 ------------------------------------ 3 files changed, 1 insertion(+), 53 deletions(-) delete mode 100755 test/validation/api/time/time.sh diff --git a/test/validation/api/Makefile.am b/test/validation/api/Makefile.am index 0503e092e..c92d123c1 100644 --- a/test/validation/api/Makefile.am +++ b/test/validation/api/Makefile.am @@ -56,7 +56,7 @@ TESTS = \ scheduler/scheduler_main$(EXEEXT) \ std_clib/std_clib_main$(EXEEXT) \ thread/thread_main$(EXEEXT) \ - time/time.sh \ + time/time_main$(EXEEXT) \ timer/timer_main$(EXEEXT) \ traffic_mngr/traffic_mngr.sh \ shmem/shmem_main$(EXEEXT) \ diff --git a/test/validation/api/time/Makefile.am b/test/validation/api/time/Makefile.am index 4c3340e06..bedbfa375 100644 --- a/test/validation/api/time/Makefile.am +++ b/test/validation/api/time/Makefile.am @@ -1,14 +1,4 @@ include ../Makefile.inc -TESTS_ENVIRONMENT += TEST_DIR=${builddir} - -TESTSCRIPTS = time.sh -TEST_EXTENSIONS = .sh - -TESTS = $(TESTSCRIPTS) - test_PROGRAMS = time_main time_main_SOURCES = time_main.c time.c time_test.h - -dist_check_SCRIPTS = $(TESTSCRIPTS) -test_SCRIPTS = $(dist_check_SCRIPTS) diff --git a/test/validation/api/time/time.sh b/test/validation/api/time/time.sh deleted file mode 100755 index ecedddb76..000000000 --- a/test/validation/api/time/time.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2017, Linaro Limited -# All rights reserved. -# -# SPDX-License-Identifier: BSD-3-Clause -# - -# directories where time_main binary can be found: -# -in the validation dir when running make check (intree or out of tree) -# -in the script directory, when running after 'make install', or -# -in the validation when running standalone (./time) intree. -# -in the current directory. -# running stand alone out of tree requires setting PATH -PATH=${TEST_DIR}/api/time:$PATH -PATH=$(dirname $0)/../../../../validation/api/time:$PATH -PATH=$(dirname $0):$PATH -PATH=`pwd`:$PATH - -time_main_path=$(which time_main${EXEEXT}) -if [ -x "$time_main_path" ] ; then - echo "running with time_main: $time_run_path" -else - echo "cannot find time_main: please set you PATH for it." - exit 1 -fi - -# exit codes expected by automake for skipped tests -TEST_SKIPPED=77 - -time_main${EXEEXT} -ret=$? - -SIGSEGV=139 - -if [ "${TRAVIS}" = "true" ] && [ $ret -ne 0 ] && - [ ${TEST} = "coverage" ] && [ $ret -ne ${SIGSEGV} ]; then - echo "SKIP: skip due significant slowdown under code coverage" - exit ${TEST_SKIPPED} -fi - -exit $ret