From: Christian Babeux <christian.babeux@efficios.com>
Date: Fri, 22 Feb 2013 04:29:02 +0000 (-0500)
Subject: Tests: Add runner script for regression testsuite
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f134f7178a3d522b6e5946c19c1e209b4e0a7ab4;p=lttng-tools.git

Tests: Add runner script for regression testsuite

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

diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 441354e12..3641cf151 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,13 +1,8 @@
-SUBDIRS = . tools kernel
+SUBDIRS = tools kernel ust
 
-AM_CFLAGS = -g -Wall
-AM_LDFLAGS = -lurcu -lurcu-cds
-
-EXTRA_DIST = run-report.py test_list.py runall.sh
+EXTRA_DIST = run-report.py test_list.py run.sh
 
 if HAVE_LIBLTTNG_UST_CTL
 SUBDIRS += ust
 endif # HAVE_LIBLTTNG_UST_CTL
 
-check-am:
-	./runall.sh
diff --git a/tests/regression/run.sh b/tests/regression/run.sh
new file mode 100755
index 000000000..f0ea74852
--- /dev/null
+++ b/tests/regression/run.sh
@@ -0,0 +1,23 @@
+#!/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/runall.sh b/tests/regression/runall.sh
deleted file mode 100755
index 4db6d5adb..000000000
--- a/tests/regression/runall.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
-#
-# 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.
-#
-
-#### ADD TESTS HERE ####
-
-tests=( kernel/runall.sh ust/runall.sh tools/runall.sh )
-
-#### END TESTS HERE ####
-
-TESTDIR=$(dirname $0)/..
-
-source $TESTDIR/utils/utils.sh
-
-## lttng-tools unit tests ##
-# No session daemon needed
-for bin in ${tests[@]};
-do
-	if [ ! -e $bin ]; then
-		echo -e "$bin not found, passing"
-		continue
-	fi
-
-	./$bin
-	# Test must return 0 to pass.
-	if [ $? -ne 0 ]; then
-		echo -e '\e[1;31mFAIL\e[0m'
-		echo ""
-		exit 1
-	fi
-done
-
-# All passed
-exit 0