X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fbuild.sh;h=dded5f1efeda0b555474c8e6f92d3c6aa069103f;hb=b9b26e2dc1815a7681e8cae1278a2e5d2191f68a;hp=2fee661d6da24e69dab04a1edbb8c7a73f3745ef;hpb=829730ddf34f53765cde98bdb23da79e18cc67b7;p=lttng-ci.git

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 2fee661..dded5f1 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -73,6 +73,7 @@ verne() {
 arch=${arch:-}
 conf=${conf:-}
 build=${build:-}
+test_type=${test_type:-}
 
 SRCDIR="$WORKSPACE/src/lttng-tools"
 #TMPDIR="$WORKSPACE/tmp"
@@ -101,6 +102,8 @@ UST_JAVA="$WORKSPACE/deps/lttng-ust/build/share/java/"
 BABEL_LIBS="$WORKSPACE/deps/babeltrace/build/lib/"
 BABEL_BINS="$WORKSPACE/deps/babeltrace/build/bin/"
 
+# pgrep
+PGREP=pgrep
 
 # Set platform variables
 case "$arch" in
@@ -173,6 +176,17 @@ cygwin|cygwin64|msys32|msys64)
     ;;
 esac
 
+case "$test_type" in
+base)
+	RUN_TESTS_LONG_REGRESSION="no"
+	;;
+full)
+	RUN_TESTS_LONG_REGRESSION="yes"
+	;;
+*)
+	RUN_TESTS_LONG_REGRESSION="no"
+	;;
+esac
 
 # Enter the source directory
 cd "$SRCDIR"
@@ -337,6 +351,9 @@ if [ "$RUN_TESTS" = "yes" ]; then
     mkdir -p "$TAPDIR/unit"
     mkdir -p "$TAPDIR/fast_regression"
     mkdir -p "$TAPDIR/with_bindings_regression"
+    if [ "$RUN_TESTS_LONG_REGRESSION" = "yes" ]; then
+        mkdir -p "$TAPDIR/long_regression"
+    fi
 
     # Force the lttng-sessiond path to /bin/true to prevent the spawing of a
     # lttng-sessiond --daemonize on "lttng create"
@@ -353,6 +370,9 @@ if [ "$RUN_TESTS" = "yes" ]; then
             prove --merge -v --exec '' - < "$BUILD_PATH/tests/fast_regression" --archive "$TAPDIR/fast_regression/" || true
             prove --merge -v --exec '' - < "$BUILD_PATH/tests/with_bindings_regression" --archive "$TAPDIR/with_bindings_regression/" || true
         fi
+        if [ "$RUN_TESTS_LONG_REGRESSION" = "yes" ]; then
+            prove --merge -v --exec '' - < "$BUILD_PATH/tests/long_regression" --archive "$TAPDIR/long_regression/" || true
+        fi
     else
         # Regression is disabled for now, we need to adjust the testsuite for no ust builds.
         echo "Tests disabled for 'no-ust'."