From f8014aa39d085d8d0bfbe8a6bf103733feff7bf6 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Mon, 10 Dec 2012 17:18:23 -0500 Subject: [PATCH] Fix: Wrong path in the overlap test Also, activate the overlap.sh tests by default in the make check. Signed-off-by: David Goulet --- tests/ust/overlap/overlap.sh | 12 +++++++++--- tests/ust/runall.sh | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/ust/overlap/overlap.sh b/tests/ust/overlap/overlap.sh index eed949d2c..6baf7c878 100755 --- a/tests/ust/overlap/overlap.sh +++ b/tests/ust/overlap/overlap.sh @@ -45,15 +45,15 @@ run_demo_app() { local dir=`pwd` - cd demo + cd $CURDIR/demo # Start test echo -n "Starting application... " - ./$CURDIR/demo-trace >/dev/null 2>&1 + ./demo-trace >/dev/null 2>&1 echo -n "Ended " print_ok - cd $dir + cd - } # 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" + 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 diff --git a/tests/ust/runall.sh b/tests/ust/runall.sh index 0f63f838a..01afceca7 100755 --- 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 \ - $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 -- 2.34.1