diff mbox series

[v12,11/14] Revert "test: time: do not fail under gcov"

Message ID 1515974412-25863-12-git-send-email-odpbot@yandex.ru
State Superseded
Headers show
Series [v12,1/14] helper: link against libpthread and libodp-linux | expand

Commit Message

Github ODP bot Jan. 15, 2018, midnight UTC 
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


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 <dmitry.ereminsolenikov@linaro.org>

---
/** 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 mbox series

Patch

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