From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 27 Mar 2013 14:18:05 +0000 (-0400)
Subject: Fix: Remove test runner script
X-Git-Tag: v2.2.0-rc1~10
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=83b68040af326eaa84e6ec24a50fd409e66ec37b;p=lttng-ust.git

Fix: Remove test runner script

Deprecated by the use of Perl prove and test lists.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6f9b969c..425440a5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@ if CXX_WORKS
 SUBDIRS += hello.cxx
 endif
 
-dist_noinst_SCRIPTS = test_loop runtests trace_matches
+dist_noinst_SCRIPTS = test_loop run.sh trace_matches unit_tests
 
 noinst_LIBRARIES = libtap.a
 
diff --git a/tests/README b/tests/README
index 1c920eb7..5f1da32f 100644
--- a/tests/README
+++ b/tests/README
@@ -1,8 +1,8 @@
 Using the ust test suite.
 
 Running
-	./runtests
-runs all the tests once. The output is in TAP format.
+	./run.sh unit_tests
+runs all the tests once.
 
 Running
 	./test_loop
diff --git a/tests/runtests b/tests/runtests
deleted file mode 100755
index 8f5c8748..00000000
--- a/tests/runtests
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2010 Ericsson AB
-#
-#    This file is part of LTTng-UST.
-#
-#    LTTng-UST 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 2 of the License, or
-#    (at your option) any later version.
-#
-#    LTTng-UST 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 LTTng-UST.  If not, see <http://www.gnu.org/licenses/>.
-
-
-tests_failed=0
-
-TESTDIR=$(dirname $0)
-
-function simple_harness_run() {
-    if ! "$TESTDIR/$@"; then
-	let tests_failed=$tests_failed+1
-    fi
-}
-
-./${TEST_DIR}/snprintf/run
-
-# This testcase is currently broken, do not run.
-# simple_harness_run tracepoint/run
-
-exit 0
diff --git a/tests/test_loop b/tests/test_loop
index 619b1e35..be3e16c4 100755
--- a/tests/test_loop
+++ b/tests/test_loop
@@ -3,7 +3,7 @@
 DIR=$(dirname $0)
 
 while [ 0 ]; do
-	$DIR/runtests
+	$DIR/run.sh $DIR/unit_tests
 	if [ "$?" != "0" ]; then
 		break;
 	fi