Remove tests depending on consumerd

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/manual_mode_tracing.sh b/tests/manual_mode_tracing.sh
deleted file mode 100755 (executable)
index f9bc793..0000000
--- a/tests/manual_mode_tracing.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2010 Ericsson AB
-#
-#    This file is part of LTTng-UST.
-#
-#    LTTng-UST is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    LTTng-UST 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with LTTng-UST.  If not, see <http://www.gnu.org/licenses/>.
-
-# This tests manual mode tracing, meaning the process is first started, then
-# the tracing is set up with ustctl. Then verifications are done to make sure
-# all the events that were supposed to be in the trace are there.
-
-TESTDIR=$(dirname $0)
-
-source $TESTDIR/test_functions.sh
-source $TESTDIR/tap.sh
-
-starttest "Manual mode tracing"
-
-plan_tests 9
-
-TRACE_DIR="/tmp/ust-testsuite-manual-trace"
-rm -rf "$TRACE_DIR"
-mkdir "$TRACE_DIR"
-
-pidfilepath="/tmp/ust-testsuite-$USER-$(date +%Y%m%d%H%M%S%N)-ust-consumerd-pid"
-mkfifo -m 0600 "$pidfilepath"
-
-UST_CONSUMERD="$TESTDIR/../ust-consumerd/ust-consumerd"
-$UST_CONSUMERD --pidfile "$pidfilepath" -o "$TRACE_DIR" >/dev/null 2>&1 &
-UST_CONSUMERD_PID="$(<$pidfilepath)"
-
-LIB_UST="$TESTDIR/../libust/.libs/libust.so.0.0.0"
-LIB_UST_MALLOC="$TESTDIR/../libustinstr-malloc/.libs/libustinstr-malloc.so"
-# Check to see if find supports -L
-find . -maxdepth 0 -L > /dev/null 2>&1
-if [ $? = 0 ] ; then
-   USE_L="-L"
-else
-   USE_L=""
-fi
-LD_PRELOAD="$LIB_UST:$LIB_UST_MALLOC" find $USE_L / >/dev/null 2>&1 &
-PID=$!
-TRACE=auto
-USTCTL="$TESTDIR/../ustctl/ustctl"
-sleep 0.1
-okx $USTCTL list-markers $PID
-okx $USTCTL enable-marker $PID $TRACE ust/malloc
-okx $USTCTL enable-marker $PID $TRACE ust/free
-okx $USTCTL create-trace $PID $TRACE
-okx $USTCTL alloc-trace $PID $TRACE
-okx $USTCTL start-trace $PID $TRACE
-sleep 0.5
-
-okx $USTCTL stop-trace $PID $TRACE
-okx $USTCTL destroy-trace $PID $TRACE
-kill $PID
-kill -SIGTERM ${UST_CONSUMERD_PID}
-wait ${UST_CONSUMERD_PID}
-
-trace_matches -N "ust.malloc" "^ust.malloc:" "$TRACE_DIR"

diff --git a/tests/runtests b/tests/runtests
index 1f047c53950f4369b63b914b43b08ae826de0e84..8f5c8748f3f3b353e6ca17fa478ff4868080f9c2 100755 (executable)
--- a/tests/runtests
+++ b/tests/runtests
@@ -30,18 +30,7 @@ function simple_harness_run() {
 
 ./${TEST_DIR}/snprintf/run
 
-simple_harness_run ./manual_mode_tracing.sh
-
-simple_harness_run ./valgrind_ust-consumerd.sh
-
 # This testcase is currently broken, do not run.
 # simple_harness_run tracepoint/run
 
-echo "************************************"
-if [[ $tests_failed -eq 0 ]]; then
-    echo "$0: All passed"
-else
-    echo "$0: $tests_failed tests failed"
-fi
-echo "************************************"
 exit 0

diff --git a/tests/valgrind_suppress.txt b/tests/valgrind_suppress.txt
deleted file mode 100644 (file)
index 2a4ac36..0000000
--- a/tests/valgrind_suppress.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-   sendmsg-iov-errors-libpthread
-   Memcheck:Param
-   socketcall.sendmsg(msg.msg_iov[i])
-   obj:/lib/libpthread-2.*
-   fun:ustcomm_send_fd
-}
-{
-   sendmsg-iov-errors-libc
-   Memcheck:Param
-   socketcall.sendmsg(msg.msg_iov[i])
-   obj:/lib/libc-2.*
-   fun:ustcomm_send_fd
-}

diff --git a/tests/valgrind_ust-consumerd.sh b/tests/valgrind_ust-consumerd.sh
deleted file mode 100755 (executable)
index 7dd6668..0000000
--- a/tests/valgrind_ust-consumerd.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2010 Ericsson AB
-#
-#    This file is part of LTTng-UST.
-#
-#    LTTng-UST is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    LTTng-UST 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with LTTng-UST.  If not, see <http://www.gnu.org/licenses/>.
-
-TESTDIR=$(dirname $0)
-
-source $TESTDIR/test_functions.sh
-source $TESTDIR/tap.sh
-
-starttest "ust-consumerd valgrind check"
-
-if ! which valgrind > /dev/null; then
-    echo "$0: Valgrind not found on the system." 1>&2
-    exit 1;
-fi
-
-plan_tests 2
-
-TRACE_DIR="/tmp/ust-testsuite-$USER-ust-consumerdvalgrind-trace"
-rm -rf "$TRACE_DIR"
-mkdir "$TRACE_DIR"
-
-pidfilepath="/tmp/ust-testsuite-$USER-$(date +%Y%m%d%H%M%S%N)-ust-consumerd-pid"
-mkfifo -m 0600 "$pidfilepath"
-
-UST_CONSUMERD="$TESTDIR/../ust-consumerd/.libs/ust-consumerd"
-USTTRACE="$TESTDIR/../usttrace"
-
-VALG_OUT=/tmp/ust-testsuite-$USER-valg.txt
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$TESTDIR/../libustconsumer/.libs/"
-valgrind --suppressions=$TESTDIR/valgrind_suppress.txt -q $UST_CONSUMERD --pidfile "$pidfilepath" -o "$TRACE_DIR" >/dev/null 2>"$VALG_OUT" &
-VALG_PID=$!
-
-# Paranoid check that valgrind is alive or we will hang forever on the fifo
-if ! ps $VALG_PID > /dev/null; then
-    echo "Valgrind appears to have died, giving up"
-    rm $pidfilepath
-    exit
-fi
-
-UST_CONSUMERD_PID="$(<$pidfilepath)"
-
-okx $USTTRACE -L -s $TESTDIR/basic/.libs/basic
-
-kill -SIGTERM ${UST_CONSUMERD_PID}
-wait $!
-
-echo "Valgrind output is in $VALG_OUT"
-if [ -z "$(<$VALG_OUT)" ]; then
-    pass "Valgrind found no errors in ust-consumerd"
-else
-    fail "Valgrind found errors in ust-consumerd:"
-    cat $VALG_OUT | while read; do
-       diag "$REPLY"
-    done
-fi
-
-rm $pidfilepath