From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 21 Feb 2013 16:53:40 +0000 (-0500)
Subject: Remove tests-libustinstr-malloc
X-Git-Tag: v2.2.0-rc1~19
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=adcdcb25b9ddf71a13a057f58f24c0dbb2f17b4f;p=lttng-ust.git

Remove tests-libustinstr-malloc

Moved to lttng-tools.

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

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 <string.h>
-#include <stdlib.h>
-
-#define N_ITER 1000
-
-int main()
-{
-	int i;
-	const char teststr[] = "Hello World! 1234567890abc";
-	void *ptrs[N_ITER];
-
-	for(i=0; i<N_ITER; i++) {
-		ptrs[i] = malloc(i+1000);
-
-		memcpy(ptrs[i], teststr, sizeof(teststr));
-
-		if(i%2 == 0) {
-			free(ptrs[i]);
-		}
-	}
-
-	for(i=0; i<N_ITER; i++) {
-		if(i%2 == 1)
-			free(ptrs[i]);
-	}
-
-	return 0;
-}
diff --git a/tests/test-libustinstr-malloc/test-libustinstr-malloc.sh b/tests/test-libustinstr-malloc/test-libustinstr-malloc.sh
deleted file mode 100755
index 04ed64df..00000000
--- a/tests/test-libustinstr-malloc/test-libustinstr-malloc.sh
+++ /dev/null
@@ -1,33 +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 "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"