Use the gen-ust-events binary found under tests/utils/testapp/gen-ust-events/.
Signed-off-by: Christian Babeux <christian.bab...@efficios.com>
---
tests/regression/ust/before-after/Makefile.am | 14 ------
tests/regression/ust/before-after/gen-nevents.c | 56 ----------------------
.../regression/ust/before-after/test_before_after | 14 +++---
tests/regression/ust/before-after/tp.c | 16 -------
.../regression/ust/before-after/ust_gen_nevents.h | 56 ----------------------
5 files changed, 8 insertions(+), 148 deletions(-)
delete mode 100644 tests/regression/ust/before-after/gen-nevents.c
delete mode 100644 tests/regression/ust/before-after/tp.c
delete mode 100644 tests/regression/ust/before-after/ust_gen_nevents.h
diff --git a/tests/regression/ust/before-after/Makefile.am
b/tests/regression/ust/before-after/Makefile.am
index f883a32..e37fe96 100644
--- a/tests/regression/ust/before-after/Makefile.am
+++ b/tests/regression/ust/before-after/Makefile.am
@@ -1,16 +1,2 @@
-AM_CFLAGS = -I$(srcdir) -O2
-AM_LDFLAGS = -llttng-ust
-
-if LTTNG_TOOLS_BUILD_WITH_LIBDL
-AM_LDFLAGS += -ldl
-endif
-if LTTNG_TOOLS_BUILD_WITH_LIBC_DL
-AM_LDFLAGS += -lc
-endif
-
-noinst_PROGRAMS = gen-nevents
-gen_nevents_SOURCES = gen-nevents.c tp.c ust_gen_nevents.h
-gen_nevents_LDADD = -llttng-ust
-
noinst_SCRIPTS = test_before_after
EXTRA_DIST = test_before_after
diff --git a/tests/regression/ust/before-after/gen-nevents.c
b/tests/regression/ust/before-after/gen-nevents.c
deleted file mode 100644
index b2c1992..0000000
--- a/tests/regression/ust/before-after/gen-nevents.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) - 2009 Pierre-Marc Fournier
- * Copyright (C) - 2011 Mathieu Desnoyers <mathieu.desnoy...@efficios.com>
- * Copyright (C) - 2012 David Goulet <dgou...@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
- */
-
-#include <arpa/inet.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#define TRACEPOINT_DEFINE
-#include "ust_gen_nevents.h"
-
-int main(int argc, char **argv)
-{
- int i, netint;
- long values[] = { 1, 2, 3 };
- char text[10] = "test";
- double dbl = 2.0;
- float flt = 2222.0;
- unsigned int nr_iter = 100;
-
- if (argc == 2) {
- nr_iter = atoi(argv[1]);
- }
-
- for (i = 0; i < nr_iter; i++) {
- netint = htonl(i);
- tracepoint(ust_gen_nevents, tptest, i, netint, values, text,
- strlen(text), dbl, flt);
- usleep(100000);
- }
-
- return 0;
-}
diff --git a/tests/regression/ust/before-after/test_before_after
b/tests/regression/ust/before-after/test_before_after
index c3e24f7..6d45bb5 100755
--- a/tests/regression/ust/before-after/test_before_after
+++ b/tests/regression/ust/before-after/test_before_after
@@ -19,27 +19,29 @@ TEST_DESC="UST tracer - Start tracing before and after
execution"
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
NR_ITER=100
+NR_USEC_WAIT=100000
+TESTAPP_PATH="$TESTDIR/utils/testapp"
+TESTAPP_NAME="gen-ust-events"
+TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
SESSION_NAME="per-session"
-EVENT_NAME="ust_gen_nevents:tptest"
+EVENT_NAME="tp:tptest"
NUM_TESTS=16
source $TESTDIR/utils/utils.sh
-if [ ! -x "$CURDIR/gen-nevents" ]; then
+if [ ! -x "$TESTAPP_BIN" ]; then
BAIL_OUT "No UST nevents binary detected."
fi
# MUST set TESTDIR before calling those functions
test_before_apps() {
- local out
-
# BEFORE application is spawned
create_lttng_session $SESSION_NAME $TRACE_PATH
enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
start_lttng_tracing $SESSION_NAME
- ./$CURDIR/gen-nevents $NR_ITER
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
ok $? "Start application to trace"
stop_lttng_tracing $SESSION_NAME
@@ -53,7 +55,7 @@ test_before_apps() {
test_after_apps() {
local out
- ./$CURDIR/gen-nevents 100 &
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
ok $? "Start application to trace"
# BEFORE application is spawned
diff --git a/tests/regression/ust/before-after/tp.c
b/tests/regression/ust/before-after/tp.c
deleted file mode 100644
index e291924..0000000
--- a/tests/regression/ust/before-after/tp.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) - 2011 Mathieu Desnoyers <mathieu.desnoy...@efficios.com>
- * Copyright (c) - 2012 David Goulet <dgou...@efficios.com>
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED OR
- * IMPLIED. ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program for any purpose,
- * provided the above notices are retained on all copies. Permission to modify
- * the code and to distribute modified code is granted, provided the above
- * notices are retained, and a notice that the code was modified is included
- * with the above copyright notice.
- */
-
-#define TRACEPOINT_CREATE_PROBES
-#include "ust_gen_nevents.h"
diff --git a/tests/regression/ust/before-after/ust_gen_nevents.h
b/tests/regression/ust/before-after/ust_gen_nevents.h
deleted file mode 100644
index bc09c44..0000000
--- a/tests/regression/ust/before-after/ust_gen_nevents.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER ust_gen_nevents
-
-#if !defined(_TRACEPOINT_UST_GEN_NEVENTS_H) ||
defined(TRACEPOINT_HEADER_MULTI_READ)
-#define _TRACEPOINT_UST_GEN_NEVENTS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoy...@efficios.com>
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose, provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-#include <lttng/tracepoint.h>
-
-TRACEPOINT_EVENT(ust_gen_nevents, tptest,
- TP_ARGS(int, anint, int, netint, long *, values,
- char *, text, size_t, textlen,
- double, doublearg, float, floatarg),
- TP_FIELDS(
- ctf_integer(int, intfield, anint)
- ctf_integer_hex(int, intfield2, anint)
- ctf_integer(long, longfield, anint)
- ctf_integer_network(int, netintfield, netint)
- ctf_integer_network_hex(int, netintfieldhex, netint)
- ctf_array(long, arrfield1, values, 3)
- ctf_array_text(char, arrfield2, text, 10)
- ctf_sequence(char, seqfield1, text, size_t, textlen)
- ctf_sequence_text(char, seqfield2, text, size_t, textlen)
- ctf_string(stringfield, text)
- ctf_float(float, floatfield, floatarg)
- ctf_float(double, doublefield, doublearg)
- )
-)
-
-#endif /* _TRACEPOINT_UST_GEN_NEVENTS_H */
-
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_gen_nevents.h
-
-/* This part must be outside ifdef protection */
-#include <lttng/tracepoint-event.h>
-
-#ifdef __cplusplus
-}
-#endif
--
1.8.2.2
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
