From adcdcb25b9ddf71a13a057f58f24c0dbb2f17b4f Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 21 Feb 2013 11:53:40 -0500 Subject: [PATCH] Remove tests-libustinstr-malloc 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/runtests | 2 - tests/test-libustinstr-malloc/Makefile.am | 5 -- tests/test-libustinstr-malloc/prog.c | 48 ------------------- .../test-libustinstr-malloc.sh | 33 ------------- 5 files changed, 89 deletions(-) delete mode 100644 tests/test-libustinstr-malloc/Makefile.am delete mode 100644 tests/test-libustinstr-malloc/prog.c delete mode 100755 tests/test-libustinstr-malloc/test-libustinstr-malloc.sh diff --git a/.gitignore b/.gitignore index 03cbcbb8..a09d4641 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,6 @@ tests/hello.cxx/hello tests/same_line_marker/same_line_marker tests/ust-basic-tracing/ust-basic-tracing tests/ust-multi-test/ust-multi-test -tests/test-libustinstr-malloc/prog tests/trace_event/trace_event_test tests/tracepoint/benchmark/tracepoint_benchmark tests/tracepoint/tracepoint_test diff --git a/tests/runtests b/tests/runtests index 11616312..17570b38 100755 --- a/tests/runtests +++ b/tests/runtests @@ -29,8 +29,6 @@ function simple_harness_run() { } -simple_harness_run test-libustinstr-malloc/test-libustinstr-malloc.sh - simple_harness_run ./manual_mode_tracing.sh simple_harness_run ./valgrind_ust-consumerd.sh diff --git a/tests/test-libustinstr-malloc/Makefile.am b/tests/test-libustinstr-malloc/Makefile.am deleted file mode 100644 index 502d6c45..00000000 --- a/tests/test-libustinstr-malloc/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -#AM_CPPFLAGS = -I$(top_srcdir)/include - -noinst_PROGRAMS = prog -prog_SOURCES = prog.c -prog_LDADD = $(top_builddir)/libust/libust.la $(top_builddir)/libust-initializer.o diff --git a/tests/test-libustinstr-malloc/prog.c b/tests/test-libustinstr-malloc/prog.c deleted file mode 100644 index 8b3d5fef..00000000 --- a/tests/test-libustinstr-malloc/prog.c +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (C) 2009 Pierre-Marc Fournier - * - * 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 program is used to test malloc instrumentation with libustinstr-malloc. - */ - -#include -#include - -#define N_ITER 1000 - -int main() -{ - int i; - const char teststr[] = "Hello World! 1234567890abc"; - void *ptrs[N_ITER]; - - for(i=0; i. - -TESTDIR=$(dirname $0)/.. - -source $TESTDIR/test_functions.sh -source $TESTDIR/tap.sh - -starttest "libustinstr-malloc" - -plan_tests 3 -USTTRACE="$TESTDIR/../usttrace" - -okx $USTTRACE -L -lm $TESTDIR/test-libustinstr-malloc/.libs/prog -trace_loc=$($USTTRACE -W) -trace_matches -N "libustinstr-malloc - malloc" -n 1000 "^ust.malloc:.*{ size = 1[0-9][0-9][0-9]," $trace_loc -check_trace_logs "$trace_loc" -- 2.34.1