Tests: Cleanup tests runner that are no longer required

Test runners have been superseeded by testlists and the prove utility.

Signed-off-by: Christian Babeux <christian.babeux@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 3641cf151dd4c477f6f4f0df2b6deb2681c49e26..ddb737213320c3e354a44dad83d6c1f5012c1f71 100644 (file)
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = tools kernel ust
 
 SUBDIRS = tools kernel ust
 

-EXTRA_DIST = run-report.py test_list.py run.sh
+EXTRA_DIST = run-report.py test_list.py

 
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS += ust
 
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS += ust

diff --git a/tests/regression/kernel/Makefile.am b/tests/regression/kernel/Makefile.am
index cff432dfc96cd6f93188879e9d8a36506ae61e71..6b2b89141da5ba562521ccc0dff11a9985e8ee8d 100644 (file)
--- a/tests/regression/kernel/Makefile.am
+++ b/tests/regression/kernel/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = run.sh test_event_basic test_all_events
+EXTRA_DIST = test_event_basic test_all_events

diff --git a/tests/regression/kernel/run.sh b/tests/regression/kernel/run.sh
deleted file mode 100755 (executable)
index fe042e4..0000000
--- a/tests/regression/kernel/run.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2013 - Christian Babeux <christian.babeux@efficios.com>
-#
-# This program 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; only version 2
-# of the License.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-
-DIR=$(dirname $0)
-TESTDIR=$DIR/../..
-source $TESTDIR/utils/runner.sh
-
-#### ADD TESTS HERE ####
-
-tests=( $DIR/test_event_basic
-        $DIR/test_all_events )
-
-#### END TESTS HERE ####
-
-opts=("$@")
-run_tests tests[@] opts[@]

diff --git a/tests/regression/run.sh b/tests/regression/run.sh
deleted file mode 100755 (executable)
index f0ea748..0000000
--- a/tests/regression/run.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2013 - Christian Babeux <christian.babeux@efficios.com>
-#
-# This program 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; only version 2
-# of the License.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-DIR=$(dirname $0)
-
-$DIR/kernel/run.sh $@
-$DIR/ust/run.sh $@
-$DIR/tools/run.sh $@

diff --git a/tests/regression/tools/Makefile.am b/tests/regression/tools/Makefile.am
index 9065a3764882009828b3424bf88c3383627e7b09..eef793a422e48e97a9ef2e068e6e4c034d784bf5 100644 (file)
--- a/tests/regression/tools/Makefile.am
+++ b/tests/regression/tools/Makefile.am
@@ -1,3 +1 @@
 SUBDIRS = streaming filtering health
 SUBDIRS = streaming filtering health

-
-EXTRA_DIST = run.sh

diff --git a/tests/regression/tools/run.sh b/tests/regression/tools/run.sh
deleted file mode 100755 (executable)
index 4f7d2c9..0000000
--- a/tests/regression/tools/run.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2013 - Christian Babeux <christian.babeux@efficios.com>
-#
-# This program 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; only version 2
-# of the License.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-
-DIR=$(dirname $0)
-TESTDIR=$DIR/../..
-source $TESTDIR/utils/runner.sh
-
-#### ADD TESTS HERE ####
-
-tests=( $DIR/filtering/test_invalid_filter
-       $DIR/filtering/test_unsupported_op
-       $DIR/filtering/test_valid_filter
-       $DIR/health/test_thread_exit
-       $DIR/health/test_thread_stall
-       $DIR/health/test_tp_fail
-       $DIR/streaming/test_kernel
-       $DIR/streaming/test_ust
-       $DIR/streaming/test_high_throughput_limits )
-
-#### END TESTS HERE ####
-
-opts=("$@")
-run_tests tests[@] opts[@]

diff --git a/tests/regression/ust/Makefile.am b/tests/regression/ust/Makefile.am
index d8904bb78c0227e7186aec989d5aea3cc07d38ef..28256c692d6c7a6df3eeb892f97a3f93b0f8bc0f 100644 (file)
--- a/tests/regression/ust/Makefile.am
+++ b/tests/regression/ust/Makefile.am
@@ -2,6 +2,6 @@ if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS = nprocesses high-throughput low-throughput before-after multi-session \
                  overlap
 
 SUBDIRS = nprocesses high-throughput low-throughput before-after multi-session \
                  overlap
 

-EXTRA_DIST = runall.sh run-ust-global-tests.sh test_event_basic test_event_wildcard
+EXTRA_DIST = test_event_basic test_event_wildcard

 
 endif
 
 endif

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 1e4cce33a90c055e39ce24d1def0005a9cd1dcc4..a9d65ab4da46576f0f4d005d0cb311bf4e5052b3 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -14,8 +14,6 @@ LIBCOMMON=$(top_builddir)/src/common/libcommon.la
 LIBSESSIOND_COMM=$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la
 
 LIBSESSIOND_COMM=$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la
 LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la
 

-EXTRA_DIST = run.sh
-

 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS = test_uri test_session test_ust_data test_kernel_data
 else
 if HAVE_LIBLTTNG_UST_CTL
 noinst_PROGRAMS = test_uri test_session test_ust_data test_kernel_data
 else

diff --git a/tests/unit/run.sh b/tests/unit/run.sh
deleted file mode 100755 (executable)
index a809e24..0000000
--- a/tests/unit/run.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2013 - Christian Babeux <christian.babeux@efficios.com>
-#
-# This program 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; only version 2
-# of the License.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-
-DIR=$(dirname $0)
-TESTDIR=$DIR/..
-source $TESTDIR/utils/runner.sh
-
-#### ADD TESTS HERE ####
-
-tests=( $DIR/test_uri
-        $DIR/test_session
-       $DIR/test_ust_data
-       $DIR/test_kernel_data )
-
-#### END TESTS HERE ####
-
-opts=("$@")
-run_tests tests[@] opts[@]

diff --git a/tests/utils/runner.sh b/tests/utils/runner.sh
deleted file mode 100644 (file)
index 8f4932a..0000000
--- a/tests/utils/runner.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2013 - Christian Babeux <christian.babeux@efficios.com>
-#
-# This program 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; only version 2
-# of the License.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-
-function run_tests
-{
-       declare -a tests=("${!1}")
-       declare -a tests_opts=("${!2}")
-
-       gentap=0
-
-       for test_opt in ${tests_opts[@]};
-       do
-           case "$test_opt" in
-               --generate-tap-files) gentap=1 ;;
-               *) ;;
-           esac
-       done
-
-       for bin in ${tests[@]};
-       do
-               if [ ! -e $bin ]; then
-                       echo -e "$bin not found, skipping."
-                       continue
-               fi
-
-               if [ "$gentap" -eq 1 ]; then
-                       ./$bin > ${bin}.tap 2>&1
-               else
-                       ./$bin
-               fi
-       done
-}