Fix: Wrong path in the overlap test

Also, activate the overlap.sh tests by default in the make check.

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/tests/ust/overlap/overlap.sh b/tests/ust/overlap/overlap.sh
index eed949d2c83aa3c4983702dbd6a8aa55431d2666..6baf7c8786227a1427fa3e926b0172e2b6c3fd40 100755 (executable)
--- a/tests/ust/overlap/overlap.sh
+++ b/tests/ust/overlap/overlap.sh
@@ -45,15 +45,15 @@ run_demo_app()
 {
        local dir=`pwd`
 
 {
        local dir=`pwd`
 

-       cd demo
+       cd $CURDIR/demo

 
        # Start test
        echo -n "Starting application... "
 
        # Start test
        echo -n "Starting application... "

-       ./$CURDIR/demo-trace >/dev/null 2>&1
+       ./demo-trace >/dev/null 2>&1

        echo -n "Ended "
        print_ok
 
        echo -n "Ended "
        print_ok
 

-       cd $dir
+       cd -

 }
 
 # Ease our life a bit ;)
 }
 
 # Ease our life a bit ;)


@@ -315,6 +315,12 @@ test_enable_same_wildcard_filter_2()
 
        enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==1"
        enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==1"
 
        enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==1"
        enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==1"

+       if [ $? -eq 1 ]; then
+               echo -n "FAIL is normal. Same event with same filter is denied by the sessiond "
+               print_ok
+       else
+               print_fail
+       fi

 
        start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
 
        start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 

diff --git a/tests/ust/runall.sh b/tests/ust/runall.sh
index 0f63f838a9952a9ac25c406a2b132e687cb30507..01afceca7c4f94394ef28a3e43f73e1734d13b26 100755 (executable)
--- a/tests/ust/runall.sh
+++ b/tests/ust/runall.sh
@@ -4,7 +4,7 @@ DIR=$(dirname $0)
 
 tests=( $DIR/run-ust-global-tests.sh $DIR/nprocesses/run \
                $DIR/high-throughput/run $DIR/before-after/run \
 
 tests=( $DIR/run-ust-global-tests.sh $DIR/nprocesses/run \
                $DIR/high-throughput/run $DIR/before-after/run \

-               $DIR/multi-session/run )
+               $DIR/multi-session/run $DIR/overlap/run )

 
 # $DIR/low-throughput/run --> DEACTIVATED.
 # Use only for release. This test last 20 minutes
 
 # $DIR/low-throughput/run --> DEACTIVATED.
 # Use only for release. This test last 20 minutes