From a9ddd4c6b99a810fcc72f346a465a6bc5938d733 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 21 Feb 2013 11:51:44 -0500 Subject: [PATCH] Remove exit-fast test MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Moved to lttng-tools. Signed-off-by: Jérémie Galarneau --- .gitignore | 1 - tests/exit-fast/Makefile.am | 5 ---- tests/exit-fast/exit-fast.c | 41 -------------------------------- tests/exit-fast/exit-fast.sh | 46 ------------------------------------ tests/runtests | 7 ------ 5 files changed, 100 deletions(-) delete mode 100644 tests/exit-fast/Makefile.am delete mode 100644 tests/exit-fast/exit-fast.c delete mode 100755 tests/exit-fast/exit-fast.sh diff --git a/.gitignore b/.gitignore index 390bbf22..03cbcbb8 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,6 @@ lttng-ust.pc ustctl/ustctl ust-consumerd/ust-consumerd -tests/exit-fast/exit-fast tests/hello/hello tests/hello.cxx/hello tests/same_line_marker/same_line_marker diff --git a/tests/exit-fast/Makefile.am b/tests/exit-fast/Makefile.am deleted file mode 100644 index d34fbc21..00000000 --- a/tests/exit-fast/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include - -noinst_PROGRAMS = exit-fast -exit_fast_SOURCES = exit-fast.c -exit_fast_LDADD = $(top_builddir)/libust/libust.la $(top_builddir)/libust-initializer.o diff --git a/tests/exit-fast/exit-fast.c b/tests/exit-fast/exit-fast.c deleted file mode 100644 index ee987f2e..00000000 --- a/tests/exit-fast/exit-fast.c +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright (C) 2011 Nils Carlson - * - * 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; either - * version 2.1 of the License, or (at your option) any later version. - * - * 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 - */ - -/* This test generates a single event and exits. - */ - -#include -#include -#include -#include -#include - -int main(int argc, char *argv[]) -{ - int suicide = 0; - - if (argc > 1 && !strcmp(argv[1], "suicide")) { - suicide = 1; - } - - ust_marker(fast, "%d", 0xf330); - - if (suicide) { - kill(getpid(), SIGKILL); - } - return 0; -} diff --git a/tests/exit-fast/exit-fast.sh b/tests/exit-fast/exit-fast.sh deleted file mode 100755 index d10af572..00000000 --- a/tests/exit-fast/exit-fast.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# -# Copyright 2011 Ericsson AB -# -# This file is part of the UST test-suite. -# -# The UST test-suite 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 2 of the License, or -# (at your option) any later version. -# -# The UST test-suite 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 the UST test-suite. If not, see . - -TESTDIR=$(dirname $0)/.. - -source $TESTDIR/test_functions.sh -source $TESTDIR/tap.sh - -starttest "Exit-Fast" - -plan_tests 6 -USTTRACE="$TESTDIR/../usttrace" - -diag "#" -diag "First run, normal exit" -diag "#" - -okx $USTTRACE -L $TESTDIR/exit-fast/exit-fast -trace_loc=$($USTTRACE -W) -trace_matches -N "fast" -n 1 "^ust.fast:" $trace_loc -check_trace_logs "$trace_loc" - -diag "#" -diag "Re-running, killing process" -diag "#" - -okx $USTTRACE -L $TESTDIR/exit-fast/exit-fast suicide -trace_loc=$($USTTRACE -W) -trace_matches -N "fast" -n 1 "^ust.fast:" $trace_loc -check_trace_logs "$trace_loc" diff --git a/tests/runtests b/tests/runtests index 9c1111f6..11616312 100755 --- a/tests/runtests +++ b/tests/runtests @@ -40,13 +40,6 @@ simple_harness_run same_line_marker/same_line_marker.sh # This testcase is currently broken, do not run. # simple_harness_run tracepoint/run -# FIXME We disable the exit-fast test for the release. This is a known -# problem with the current UST design that we will be working on fixing -# in the upcoming rework for integration with the lttng-tools. We don't -# want to flood testers with known issues, hence the choice to disable -# the test. -#simple_harness_run exit-fast/exit-fast.sh - echo "************************************" if [[ $tests_failed -eq 0 ]]; then echo "$0: All passed" -- 2.34.1