Tests: Convert the UST overlap test output to TAP
authorChristian Babeux <christian.babeux@efficios.com>
Fri, 22 Feb 2013 03:53:40 +0000 (22:53 -0500)
committerChristian Babeux <christian.babeux@efficios.com>
Fri, 22 Feb 2013 18:00:29 +0000 (13:00 -0500)
Signed-off-by: Christian Babeux <christian.babeux@efficios.com>
tests/regression/ust/overlap/Makefile.am
tests/regression/ust/overlap/overlap.sh [deleted file]
tests/regression/ust/overlap/test_overlap

index d90146f9f63f0a3d83ea504589f3747420c0b529..5e0a80467eced8aeb33f0bfe136edabf8c43d691 100644 (file)
@@ -1,4 +1,4 @@
 SUBDIRS = demo
 
 noinst_SCRIPTS = test_overlap
-EXTRA_DIST = test_overlap overlap.sh
+EXTRA_DIST = test_overlap
diff --git a/tests/regression/ust/overlap/overlap.sh b/tests/regression/ust/overlap/overlap.sh
deleted file mode 100755 (executable)
index 8498199..0000000
+++ /dev/null
@@ -1,693 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
-#
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
-TEST_DESC="UST - Wildcard overlap"
-
-CURDIR=$(dirname $0)/
-TESTDIR=$CURDIR/../../..
-SESSION_NAME="wildcard-overlap"
-
-DEMO_EVENT1="ust_tests_demo:starting"
-DEMO_EVENT1_2="ust_tests_demo:done"
-DEMO_EVENT2="ust_tests_demo2:loop"
-DEMO_EVENT3="ust_tests_demo3:done"
-
-NUM_DEMO1_EVENT=1
-NUM_DEMO1_2_EVENT=1
-NUM_DEMO2_EVENT=5
-NUM_DEMO3_EVENT=1
-
-source $TESTDIR/utils/utils.sh
-
-print_test_banner "$TEST_DESC"
-
-if [ ! -x "$CURDIR/demo/demo" ]; then
-       echo -e "No UST nevents binary detected. Passing."
-       exit 0
-fi
-
-# MUST set TESTDIR before calling those functions
-
-run_demo_app()
-{
-       cd $CURDIR/demo
-
-       # Start test
-       echo -n "Starting application... "
-       ./demo-trace >/dev/null 2>&1
-       echo -n "Ended "
-       print_ok
-
-       cd -
-}
-
-# Ease our life a bit ;)
-trace_match_demo1_events()
-{
-       trace_matches "$DEMO_EVENT1" $NUM_DEMO1_EVENT $TRACE_PATH
-       trace_matches "$DEMO_EVENT1_2" $NUM_DEMO1_EVENT $TRACE_PATH
-}
-
-# Ease our life a bit ;)
-trace_match_all_demo_events()
-{
-       trace_match_demo1_events
-       trace_matches "$DEMO_EVENT2" $NUM_DEMO2_EVENT $TRACE_PATH
-       trace_matches "$DEMO_EVENT3" $NUM_DEMO3_EVENT $TRACE_PATH
-}
-
-# Ease our life a bit ;)
-trace_match_no_demo_events()
-{
-       trace_matches "$DEMO_EVENT1" 0 $TRACE_PATH
-       trace_matches "$DEMO_EVENT1_2" 0 $TRACE_PATH
-       trace_matches "$DEMO_EVENT2" 0 $TRACE_PATH
-       trace_matches "$DEMO_EVENT3" 0 $TRACE_PATH
-}
-
-# Expect all "demo" events, no duplicate.
-test_enable_simple_wildcard()
-{
-       local event_wild1="us*"
-       local event_wild2="ust*"
-
-       echo ""
-       echo "=== Simple wildcard overlap"
-
-       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
-       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-
-       return $?
-}
-
-# Expect all "demo" events, no duplicate.
-test_enable_wildcard_filter()
-{
-       local event_wild1="us*"
-       local event_wild2="ust*"
-
-       echo ""
-       echo "=== Wildcard overlap with filter"
-
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-       return $?
-}
-
-# Expect all "demo" events, no duplicate.
-test_enable_wildcard_filter_2()
-{
-       local event_wild1="us*"
-       local event_wild2="ust*"
-
-       echo ""
-       echo "=== Wildcard overlap with filter 2"
-
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-       return $?
-}
-
-# Expect all "demo" events, no duplicate.
-test_enable_wildcard_filter_3()
-{
-       local event_wild1="us*"
-       local event_wild2="ust*"
-
-       echo ""
-       echo "=== Wildcard overlap with filter 3"
-
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-       return $?
-}
-
-# Expected: No events.
-test_enable_wildcard_filter_4()
-{
-       local event_wild1="us*"
-       local event_wild2="ust*"
-
-       echo ""
-       echo "=== Wildcard overlap with filter 4"
-
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_no_demo_events
-       return $?
-}
-
-# Expect all "demo" events, no duplicate.
-test_enable_wildcard_filter_5()
-{
-       local event_wild1="us*"
-       local event_wild2="$DEMO_EVENT1"
-
-       echo ""
-       echo "=== Wildcard overlap with filter 5"
-
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-       return $?
-}
-
-# Expect all $DEMO_EVENT1 events, no duplicate.
-test_enable_wildcard_filter_6()
-{
-       local event_wild1="us*"
-       local event_wild2="$DEMO_EVENT1"
-
-       echo ""
-       echo "=== Wildcard overlap with filter 6"
-
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
-       trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
-       trace_matches $DEMO_EVENT2 0 $TRACE_PATH
-       trace_matches $DEMO_EVENT3 0 $TRACE_PATH
-       return $?
-}
-
-# Expect all events, no duplicate.
-test_enable_wildcard_filter_7()
-{
-       local event_wild1="us*"
-       local event_wild2="$DEMO_EVENT1"
-
-       echo ""
-       echo "=== Wildcard overlap with filter 7"
-
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-       return $?
-}
-
-# Expected: No events.
-test_enable_wildcard_filter_8()
-{
-       local event_wild1="us*"
-       local event_wild2="$DEMO_EVENT1"
-
-       echo ""
-       echo "=== Wildcard overlap with filter 8"
-
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_no_demo_events
-       return $?
-}
-
-# Expect all events.
-test_enable_same_wildcard_filter()
-{
-       local event_wild1="ust*"
-       local event_wild2="ust*"
-
-       echo ""
-       echo "=== Same wildcard overlap with filter"
-
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-       return $?
-}
-
-# Expect all events.
-test_enable_same_wildcard_filter_2()
-{
-       local event_wild1="ust*"
-       local event_wild2="ust*"
-
-       echo ""
-       echo "=== Same wildcard overlap with 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
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-       return $?
-}
-
-# Expect all events.
-test_enable_same_wildcard_filter_3()
-{
-       local event_wild1="ust*"
-       local event_wild2="ust*"
-
-       echo ""
-       echo "=== Same wildcard overlap with filter 3"
-
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-       return $?
-}
-
-# Expected: No events.
-test_enable_same_wildcard_filter_4()
-{
-       local event_wild1="ust*"
-       local event_wild2="ust*"
-
-       echo ""
-       echo "=== Same wildcard overlap with filter 4"
-
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0&&1==0"
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_no_demo_events
-       return $?
-}
-
-# Expected: Only $DEMO_EVENT1
-test_enable_same_event_filter()
-{
-       local event_wild1="$DEMO_EVENT1"
-       local event_wild2="$DEMO_EVENT1"
-
-       echo ""
-       echo "=== Enable same event with filter."
-
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
-
-       disable_ust_lttng_event $SESSION_NAME "ust*"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
-       trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
-       trace_matches $DEMO_EVENT2 0 $TRACE_PATH
-       trace_matches $DEMO_EVENT3 0 $TRACE_PATH
-       return $?
-}
-
-# Expected: No events.
-test_disable_same_wildcard_filter()
-{
-       local event_wild1="ust*"
-       local event_wild2="ust*"
-
-       echo ""
-       echo "=== Disable same wildcard with filter."
-
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
-       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
-
-       disable_ust_lttng_event $SESSION_NAME "ust*"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_no_demo_events
-       return $?
-}
-
-# Expect no events
-test_enable_bad_wildcard()
-{
-       # Invalid event
-       local event_wild1="ust_tests_demo"
-       local event_wild2="ust_tests_demo2"
-       local event_wild3="ust_tests_demo3"
-
-       echo ""
-       echo "=== Enable bad wildcard"
-
-       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
-       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
-       enable_ust_lttng_event $SESSION_NAME "$event_wild3"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_no_demo_events
-       return $?
-}
-
-# Expect all "demo" events, no duplicate.
-test_enable_simple_wildcard_2()
-{
-       local event_wild1="us*"
-       local event_wild2="$DEMO_EVENT1"
-
-       echo ""
-       echo "=== Simple wildcard 2"
-
-       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
-       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-       return $?
-}
-
-# Expected: all CRIT events, + all warning events.
-test_enable_loglevel_overlap()
-{
-       local event_wild1="us*"
-       local event_wild2="ust*"
-
-       echo ""
-       echo "=== Enable loglevel overlap"
-
-       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
-       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_CRIT"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-       return $?
-}
-
-# Expected: all CRIT events, + all warning events.
-test_enable_loglevel_only_overlap()
-{
-       local event_wild1="us*"
-       local event_wild2="ust*"
-
-       echo ""
-       echo "=== Enable loglevel only overlap"
-
-       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
-       enable_ust_lttng_event_loglevel_only $SESSION_NAME "$event_wild2" "TRACE_CRIT"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-       return $?
-}
-
-# Expected: all events
-test_enable_loglevel_overlap_2()
-{
-       local event_wild1="us*"
-       local event_wild2="$DEMO_EVENT2"
-
-       echo ""
-       echo "=== Enable loglevel overlap 2"
-
-       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
-       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_CRIT"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-       return $?
-}
-
-# Expected only ust_tests_demo* events.
-test_enable_same_wildcard_loglevels()
-{
-       local event_wild1="ust*"
-       local event_wild2="ust*"
-
-       echo ""
-       echo "=== Enable same wildcard with different loglevels"
-
-       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_CRIT"
-       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_WARNING"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_match_all_demo_events
-       return $?
-}
-
-# Expected only ust_tests_demo:starting events.
-test_enable_same_event_loglevels()
-{
-       local event_wild1="$DEMO_EVENT1"
-       local event_wild2="$DEMO_EVENT1"
-
-       echo ""
-       echo "=== Enable same event with different loglevels"
-
-       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_CRIT"
-       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_WARNING"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
-       trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
-       trace_matches $DEMO_EVENT2 0 $TRACE_PATH
-       trace_matches $DEMO_EVENT3 0 $TRACE_PATH
-       return $?
-}
-
-# Expect 0 event
-test_disable_simple_wildcard()
-{
-       local event_wild1="us*"
-       local event_wild2="$DEMO_EVENT1"
-
-       echo ""
-       echo "=== Disable simple wildcard"
-
-       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
-       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
-
-       disable_ust_lttng_event $SESSION_NAME "$event_wild1"
-       disable_ust_lttng_event $SESSION_NAME "$event_wild2"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       # No events are expected.
-       trace_match_no_demo_events
-       return $?
-}
-
-# Expect only "ust_tests_demo" events.
-test_disable_wildcard_overlap()
-{
-       local event_wild1="us*"
-       local event_wild2="$DEMO_EVENT1"
-
-       echo ""
-       echo "=== Disable wildcard overlap"
-
-       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
-       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
-
-       disable_ust_lttng_event $SESSION_NAME "$event_wild1"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       run_demo_app
-
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
-
-       # Expect only "ust_tests_demo" events.
-       trace_matches "$DEMO_EVENT1" $NUM_DEMO1_EVENT $TRACE_PATH
-       trace_matches "$DEMO_EVENT1_2" 0 $TRACE_PATH
-       trace_matches "$DEMO_EVENT2" 0 $TRACE_PATH
-       trace_matches "$DEMO_EVENT3" 0 $TRACE_PATH
-       return $?
-}
-
-TESTS=(
-       "test_enable_wildcard_filter"
-       "test_enable_wildcard_filter_2"
-       "test_enable_wildcard_filter_3"
-       "test_enable_wildcard_filter_4"
-       "test_enable_wildcard_filter_5"
-       "test_enable_wildcard_filter_6"
-       "test_enable_wildcard_filter_7"
-       "test_enable_wildcard_filter_8"
-       "test_enable_same_wildcard_filter"
-       "test_enable_same_wildcard_filter_2"
-       "test_enable_same_wildcard_filter_3"
-       "test_enable_same_wildcard_filter_4"
-       "test_enable_same_event_filter"
-       "test_enable_loglevel_only_overlap"
-       "test_enable_same_event_loglevels"
-       "test_enable_same_wildcard_loglevels"
-       "test_enable_bad_wildcard"
-       "test_enable_loglevel_overlap_2"
-       "test_enable_simple_wildcard"
-       "test_enable_simple_wildcard_2"
-       "test_enable_loglevel_overlap"
-       "test_disable_simple_wildcard"
-       "test_disable_wildcard_overlap"
-)
-
-TEST_COUNT=${#TESTS[@]}
-i=0
-
-start_lttng_sessiond
-
-while [ "$i" -lt "$TEST_COUNT" ]; do
-
-       TRACE_PATH=$(mktemp -d)
-
-       create_lttng_session $SESSION_NAME $TRACE_PATH >/dev/null 2>&1
-
-       # Execute test
-       ${TESTS[$i]}
-       if [ $? -ne 0 ]; then
-               stop_lttng_sessiond
-               exit 1
-       fi
-
-       destroy_lttng_session $SESSION_NAME >/dev/null 2>&1
-
-       rm -rf $TRACE_PATH
-
-       let "i++"
-done
-
-stop_lttng_sessiond
index ca8efb34f098bb301129c3b90ab86ce3dffefc01..631db84cbd9383b3e51d507cd0cc37f3358ce267 100755 (executable)
 #!/bin/bash
+#
+# Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
+#
+# This library is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+TEST_DESC="UST - Wildcard overlap"
 
-DIR=$(dirname $0)
+CURDIR=$(dirname $0)/
+TESTDIR=$CURDIR/../../..
+SESSION_NAME="wildcard-overlap"
 
-tests=( $DIR/overlap.sh)
+DEMO_EVENT1="ust_tests_demo:starting"
+DEMO_EVENT1_2="ust_tests_demo:done"
+DEMO_EVENT2="ust_tests_demo2:loop"
+DEMO_EVENT3="ust_tests_demo3:done"
 
-exit_code=0
+NUM_DEMO1_EVENT=1
+NUM_DEMO1_2_EVENT=1
+NUM_DEMO2_EVENT=5
+NUM_DEMO3_EVENT=1
 
-function start_tests ()
+NUM_TESTS=260
+
+source $TESTDIR/utils/utils.sh
+
+print_test_banner "$TEST_DESC"
+
+if [ ! -x "$CURDIR/demo/demo" ]; then
+       BAIL_OUT "No UST nevents binary detected."
+fi
+
+# MUST set TESTDIR before calling those functions
+
+run_demo_app()
+{
+       cd $CURDIR/demo
+
+       # Start test
+       ./demo-trace >/dev/null 2>&1
+       ok $? "Start application"
+
+       cd -
+}
+
+# Ease our life a bit ;)
+trace_match_demo1_events()
+{
+       trace_matches "$DEMO_EVENT1" $NUM_DEMO1_EVENT $TRACE_PATH
+       trace_matches "$DEMO_EVENT1_2" $NUM_DEMO1_EVENT $TRACE_PATH
+}
+
+# Ease our life a bit ;)
+trace_match_all_demo_events()
+{
+       trace_match_demo1_events
+       trace_matches "$DEMO_EVENT2" $NUM_DEMO2_EVENT $TRACE_PATH
+       trace_matches "$DEMO_EVENT3" $NUM_DEMO3_EVENT $TRACE_PATH
+}
+
+# Ease our life a bit ;)
+trace_match_no_demo_events()
 {
-    for bin in ${tests[@]};
-    do
-        ./$bin
-        # Test must return 0 to pass.
-        if [ $? -ne 0 ]; then
-            exit_code=1
-            break
-        fi
-    done
+       trace_matches "$DEMO_EVENT1" 0 $TRACE_PATH
+       trace_matches "$DEMO_EVENT1_2" 0 $TRACE_PATH
+       trace_matches "$DEMO_EVENT2" 0 $TRACE_PATH
+       trace_matches "$DEMO_EVENT3" 0 $TRACE_PATH
 }
 
-start_tests
+# Expect all "demo" events, no duplicate.
+test_enable_simple_wildcard()
+{
+       local event_wild1="us*"
+       local event_wild2="ust*"
+
+       diag "Simple wildcard overlap"
+
+       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
+       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+
+       return $?
+}
+
+# Expect all "demo" events, no duplicate.
+test_enable_wildcard_filter()
+{
+       local event_wild1="us*"
+       local event_wild2="ust*"
+
+       diag "Wildcard overlap with filter"
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+       return $?
+}
+
+# Expect all "demo" events, no duplicate.
+test_enable_wildcard_filter_2()
+{
+       local event_wild1="us*"
+       local event_wild2="ust*"
+
+       diag "Wildcard overlap with filter 2"
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+       return $?
+}
+
+# Expect all "demo" events, no duplicate.
+test_enable_wildcard_filter_3()
+{
+       local event_wild1="us*"
+       local event_wild2="ust*"
+
+       diag "Wildcard overlap with filter 3"
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+       return $?
+}
+
+# Expected: No events.
+test_enable_wildcard_filter_4()
+{
+       local event_wild1="us*"
+       local event_wild2="ust*"
+
+       diag "Wildcard overlap with filter 4"
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_no_demo_events
+       return $?
+}
+
+# Expect all "demo" events, no duplicate.
+test_enable_wildcard_filter_5()
+{
+       local event_wild1="us*"
+       local event_wild2="$DEMO_EVENT1"
+
+       diag "Wildcard overlap with filter 5"
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+       return $?
+}
+
+# Expect all $DEMO_EVENT1 events, no duplicate.
+test_enable_wildcard_filter_6()
+{
+       local event_wild1="us*"
+       local event_wild2="$DEMO_EVENT1"
+
+       diag "Wildcard overlap with filter 6"
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
+       trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
+       trace_matches $DEMO_EVENT2 0 $TRACE_PATH
+       trace_matches $DEMO_EVENT3 0 $TRACE_PATH
+       return $?
+}
+
+# Expect all events, no duplicate.
+test_enable_wildcard_filter_7()
+{
+       local event_wild1="us*"
+       local event_wild2="$DEMO_EVENT1"
+
+       diag "Wildcard overlap with filter 7"
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+       return $?
+}
+
+# Expected: No events.
+test_enable_wildcard_filter_8()
+{
+       local event_wild1="us*"
+       local event_wild2="$DEMO_EVENT1"
+
+       diag "Wildcard overlap with filter 8"
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_no_demo_events
+       return $?
+}
+
+# Expect all events.
+test_enable_same_wildcard_filter()
+{
+       local event_wild1="ust*"
+       local event_wild2="ust*"
+
+       diag "Same wildcard overlap with filter"
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+       return $?
+}
+
+# Expect all events.
+test_enable_same_wildcard_filter_2()
+{
+       local event_wild1="ust*"
+       local event_wild2="ust*"
+
+       diag "Same wildcard overlap with filter 2"
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+
+       # Enabling the same events with same filters should fail
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_wild2" -s $SESSION_NAME -u --filter "1==1" >/dev/null 2>&1
+
+       if [ $? -eq 1 ]; then
+           pass "Enable event $event_name with filtering for session $sess_name twice failure detected"
+       else
+           fail "Enable event $event_name with filtering for session $sess_name twice failure detected"
+       fi
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+       return $?
+}
+
+# Expect all events.
+test_enable_same_wildcard_filter_3()
+{
+       local event_wild1="ust*"
+       local event_wild2="ust*"
+
+       diag "Same wildcard overlap with filter 3"
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+       return $?
+}
+
+# Expected: No events.
+test_enable_same_wildcard_filter_4()
+{
+       local event_wild1="ust*"
+       local event_wild2="ust*"
+
+       diag "Same wildcard overlap with filter 4"
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0&&1==0"
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_no_demo_events
+       return $?
+}
+
+# Expected: Only $DEMO_EVENT1
+test_enable_same_event_filter()
+{
+       local event_wild1="$DEMO_EVENT1"
+       local event_wild2="$DEMO_EVENT1"
+
+       diag "Enable same event with filter."
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+       disable_ust_lttng_event $SESSION_NAME "ust*"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
+       trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
+       trace_matches $DEMO_EVENT2 0 $TRACE_PATH
+       trace_matches $DEMO_EVENT3 0 $TRACE_PATH
+       return $?
+}
+
+# Expected: No events.
+test_disable_same_wildcard_filter()
+{
+       local event_wild1="ust*"
+       local event_wild2="ust*"
+
+       diag "Disable same wildcard with filter."
+
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
+       enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+       disable_ust_lttng_event $SESSION_NAME "ust*"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_no_demo_events
+       return $?
+}
+
+# Expect no events
+test_enable_bad_wildcard()
+{
+       # Invalid event
+       local event_wild1="ust_tests_demo"
+       local event_wild2="ust_tests_demo2"
+       local event_wild3="ust_tests_demo3"
+
+       diag "Enable bad wildcard"
+
+       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
+       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
+       enable_ust_lttng_event $SESSION_NAME "$event_wild3"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_no_demo_events
+       return $?
+}
+
+# Expect all "demo" events, no duplicate.
+test_enable_simple_wildcard_2()
+{
+       local event_wild1="us*"
+       local event_wild2="$DEMO_EVENT1"
+
+       diag "Simple wildcard 2"
+
+       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
+       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+       return $?
+}
+
+# Expected: all CRIT events, + all warning events.
+test_enable_loglevel_overlap()
+{
+       local event_wild1="us*"
+       local event_wild2="ust*"
+
+       diag "Enable loglevel overlap"
+
+       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
+       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_CRIT"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+       return $?
+}
+
+# Expected: all CRIT events, + all warning events.
+test_enable_loglevel_only_overlap()
+{
+       local event_wild1="us*"
+       local event_wild2="ust*"
+
+       diag "Enable loglevel only overlap"
+
+       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
+       enable_ust_lttng_event_loglevel_only $SESSION_NAME "$event_wild2" "TRACE_CRIT"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+       return $?
+}
+
+# Expected: all events
+test_enable_loglevel_overlap_2()
+{
+       local event_wild1="us*"
+       local event_wild2="$DEMO_EVENT2"
+
+       diag "Enable loglevel overlap 2"
+
+       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
+       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_CRIT"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+       return $?
+}
+
+# Expected only ust_tests_demo* events.
+test_enable_same_wildcard_loglevels()
+{
+       local event_wild1="ust*"
+       local event_wild2="ust*"
+
+       diag "Enable same wildcard with different loglevels"
+
+       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_CRIT"
+       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_WARNING"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_match_all_demo_events
+       return $?
+}
+
+# Expected only ust_tests_demo:starting events.
+test_enable_same_event_loglevels()
+{
+       local event_wild1="$DEMO_EVENT1"
+       local event_wild2="$DEMO_EVENT1"
+
+       diag "Enable same event with different loglevels"
+
+       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_CRIT"
+       enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_WARNING"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
+       trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
+       trace_matches $DEMO_EVENT2 0 $TRACE_PATH
+       trace_matches $DEMO_EVENT3 0 $TRACE_PATH
+       return $?
+}
+
+# Expect 0 event
+test_disable_simple_wildcard()
+{
+       local event_wild1="us*"
+       local event_wild2="$DEMO_EVENT1"
+
+       diag "Disable simple wildcard"
+
+       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
+       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
+
+       disable_ust_lttng_event $SESSION_NAME "$event_wild1"
+       disable_ust_lttng_event $SESSION_NAME "$event_wild2"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       # No events are expected.
+       trace_match_no_demo_events
+       return $?
+}
+
+# Expect only "ust_tests_demo" events.
+test_disable_wildcard_overlap()
+{
+       local event_wild1="us*"
+       local event_wild2="$DEMO_EVENT1"
+
+       diag "Disable wildcard overlap"
+
+       enable_ust_lttng_event $SESSION_NAME "$event_wild1"
+       enable_ust_lttng_event $SESSION_NAME "$event_wild2"
+
+       disable_ust_lttng_event $SESSION_NAME "$event_wild1"
+
+       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       run_demo_app
+
+       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+
+       # Expect only "ust_tests_demo" events.
+       trace_matches "$DEMO_EVENT1" $NUM_DEMO1_EVENT $TRACE_PATH
+       trace_matches "$DEMO_EVENT1_2" 0 $TRACE_PATH
+       trace_matches "$DEMO_EVENT2" 0 $TRACE_PATH
+       trace_matches "$DEMO_EVENT3" 0 $TRACE_PATH
+       return $?
+}
+
+plan_tests $NUM_TESTS
+
+TESTS=(
+       "test_enable_wildcard_filter"
+       "test_enable_wildcard_filter_2"
+       "test_enable_wildcard_filter_3"
+       "test_enable_wildcard_filter_4"
+       "test_enable_wildcard_filter_5"
+       "test_enable_wildcard_filter_6"
+       "test_enable_wildcard_filter_7"
+       "test_enable_wildcard_filter_8"
+       "test_enable_same_wildcard_filter"
+       "test_enable_same_wildcard_filter_2"
+       "test_enable_same_wildcard_filter_3"
+       "test_enable_same_wildcard_filter_4"
+       "test_enable_same_event_filter"
+       "test_enable_loglevel_only_overlap"
+       "test_enable_same_event_loglevels"
+       "test_enable_same_wildcard_loglevels"
+       "test_enable_bad_wildcard"
+       "test_enable_loglevel_overlap_2"
+       "test_enable_simple_wildcard"
+       "test_enable_simple_wildcard_2"
+       "test_enable_loglevel_overlap"
+       "test_disable_simple_wildcard"
+       "test_disable_wildcard_overlap"
+)
+
+TEST_COUNT=${#TESTS[@]}
+i=0
+
+start_lttng_sessiond
+
+while [ "$i" -lt "$TEST_COUNT" ]; do
+
+       TRACE_PATH=$(mktemp -d)
+
+       create_lttng_session $SESSION_NAME $TRACE_PATH >/dev/null 2>&1
+
+       # Execute test
+       ${TESTS[$i]}
+       if [ $? -ne 0 ]; then
+               stop_lttng_sessiond
+               exit 1
+       fi
+
+       destroy_lttng_session $SESSION_NAME >/dev/null 2>&1
+
+       rm -rf $TRACE_PATH
+
+       let "i++"
+done
 
-exit $exit_code
+stop_lttng_sessiond
This page took 0.040015 seconds and 5 git commands to generate.