* Jérémie Galarneau ([email protected]) wrote: > Deprecated by the use of Perl prove and test lists.
merged, thanks! Mathieu > > Signed-off-by: Jérémie Galarneau <[email protected]> > --- > tests/Makefile.am | 2 +- > tests/README | 4 ++-- > tests/runtests | 36 ------------------------------------ > tests/test_loop | 2 +- > 4 files changed, 4 insertions(+), 40 deletions(-) > delete mode 100755 tests/runtests > > diff --git a/tests/Makefile.am b/tests/Makefile.am > index 6f9b969..425440a 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 1c920eb..5f1da32 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 8f5c874..0000000 > --- 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 619b1e3..be3e16c 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 > -- > 1.8.2 > > > _______________________________________________ > lttng-dev mailing list > [email protected] > http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
