X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Frun.sh;h=c6c50fd9cff94ecb02ef1e9b3eab2e98180043c6;hp=d63c72b9be7aada31f652c7f0fa2e175b2e127a8;hb=eeeb081146ad4d2a71d4481369e88096b851dac1;hpb=e3bef7256ce348cf232ede3f36721e661cfda2a7

diff --git a/tests/run.sh b/tests/run.sh
index d63c72b9b..c6c50fd9c 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -16,7 +16,7 @@
 # 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/regression/run.sh $@
-$DIR/unit/run.sh $@
+[ -z "$1" ] && echo "Error: No testlist. Please specify a testlist to run." && exit 1
+
+prove --merge --exec '' - < $1