From f134f7178a3d522b6e5946c19c1e209b4e0a7ab4 Mon Sep 17 00:00:00 2001
From: Christian Babeux <christian.babeux@efficios.com>
Date: Thu, 21 Feb 2013 23:29:02 -0500
Subject: [PATCH] Tests: Add runner script for regression testsuite

Signed-off-by: Christian Babeux <christian.babeux@efficios.com>
---
 tests/regression/Makefile.am           |  9 ++-----
 tests/regression/{runall.sh => run.sh} | 36 ++++----------------------
 2 files changed, 7 insertions(+), 38 deletions(-)
 rename tests/regression/{runall.sh => run.sh} (56%)

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/runall.sh b/tests/regression/run.sh
similarity index 56%
rename from tests/regression/runall.sh
rename to tests/regression/run.sh
index 4db6d5adb..f0ea74852 100755
--- a/tests/regression/runall.sh
+++ b/tests/regression/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+# 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
@@ -16,34 +16,8 @@
 # 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)
 
-#### 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
+$DIR/kernel/run.sh $@
+$DIR/ust/run.sh $@
+$DIR/tools/run.sh $@
-- 
2.34.1