From patchwork Mon Jan 15 10:00:13 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: 124489 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp618150lje; Mon, 15 Jan 2018 02:10:58 -0800 (PST) X-Google-Smtp-Source: ACJfBoslTv5Ngqw8hPRUlGxd5vJaKokjxKpqb4v1AevrY4VfOZEy21SQfykNKEv924BcLMPc8LcE X-Received: by 10.200.34.91 with SMTP id p27mr1333113qtp.117.1516011058633; Mon, 15 Jan 2018 02:10:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516011058; cv=none; d=google.com; s=arc-20160816; b=hXGYBl1rf2iNz5utJqmY+5JshkveRnRhgDDbgZnRbXWv9XP8cuqtfFEyyHTD4CpRtV vhzwskUDyn8RZwYzMont5B4IHKamvb7yHzo/yk45uFtEJ3REzpW6P7AMzWu7LLr5DYMG GJqM63CfPjJKlfClMTHtXMQTKwt0RkFF9hDP0ZQCC7sqUBl6CNvyY57gpbt+cWgjZPgK oHqFTH3L5xJAHMnUb8hsB/jcbpjxIzEkGL3b7J8/ziq37gc+VTiSw4rRqw/B26ZZAdho HZlXL/VN8lrt+x/XjsmGX8lmIPUniuUa0V8k5Jz5xbYm0AteeITL75AvX3aeNXdeUGqR IsXQ== 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=+1linCQqnKnvHLnPnR4hQQm7wB2BR/u3ForERZeZnlk=; b=1H0eVLAcjPB6Z6TJVZYkIGoiVbX9wgeZq/gDq4pNcRy+E3W9gQP+FNJ+8Ie+A/OEaO xDkwdJkGhgQDNuH2WavsPcbtE4K+70/Dl7BxEtIav1JNOwo2D6Yggm0JCht/hIfuEzcf uhljFxs2TVJEYa6OsC7bxyUYsi0Q7t4fivR7nYRKrMK80LwQJMzOO5rQGdJC6i2/7FPk u/np/oevRzemMtV3R8eotDLA4K1cNKvsV6nzYvih+qsZ7wopBTeATbFU9OSFq1rm1TON ikdwgS5bkNqw+zxdusFTTkQJk12OR/xE+wFJSVscz+4kHVUrqWWY4VihTBDcZtqXkZXn fcsA== 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 z1si2354979qke.310.2018.01.15.02.10.58; Mon, 15 Jan 2018 02:10:58 -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 3A733608DE; Mon, 15 Jan 2018 10:10:58 +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_H3, RCVD_IN_MSPIKE_WL 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 42A55617B4; Mon, 15 Jan 2018 10:02:16 +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 8B73B61783; Mon, 15 Jan 2018 10:02:07 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id 409EB61783 for ; Mon, 15 Jan 2018 10:00:26 +0000 (UTC) Received: from mxback10j.mail.yandex.net (mxback10j.mail.yandex.net [IPv6:2a02:6b8:0:1619::113]) by forward106p.mail.yandex.net (Yandex) with ESMTP id D4F342D83856 for ; Mon, 15 Jan 2018 13:00:24 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback10j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id EBMJx3ixJv-0Oc8KLOH; Mon, 15 Jan 2018 13:00:24 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ZqkoG8NoF8-0Oriivhl; Mon, 15 Jan 2018 13:00:24 +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 13:00:13 +0300 Message-Id: <1516010417-3323-12-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516010417-3323-1-git-send-email-odpbot@yandex.ru> References: <1516010417-3323-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 377 Subject: [lng-odp] [PATCH v13 11/15] 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: 9dbaba7b2769979792f04d62a6c8accf0c6b13df **/ 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