projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sessiond: remove ust-metadata.cpp
[lttng-tools.git]
/
tests
/
regression
/
ust
/
ust-dl
/
prog.c
diff --git
a/tests/regression/ust/ust-dl/prog.c
b/tests/regression/ust/ust-dl/prog.c
index e8e4b2641a1c6a0437c0e94ca6933eda741e30fc..60fb0d1dc9c415f9671a04ae910eb4780c5dd8c7 100644
(file)
--- a/
tests/regression/ust/ust-dl/prog.c
+++ b/
tests/regression/ust/ust-dl/prog.c
@@
-1,9
+1,17
@@
+/*
+ * Copyright (C) 2016 Antoine Busque <abusque@efficios.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
+ *
+ */
+
/* _GNU_SOURCE is defined by config.h */
/* _GNU_SOURCE is defined by config.h */
+#include <common/compat/errno.hpp>
+
#include <dlfcn.h>
#include <stdio.h>
#include <dlfcn.h>
#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
#include <stdlib.h>
#include <stdlib.h>
+#include <unistd.h>
/*
* libfoo has a direct dependency on libbar.
/*
* libfoo has a direct dependency on libbar.
@@
-11,9
+19,14
@@
* This test is therefore a mix of dlopen/dlclose and dlmopen/dlclose of
* libfoo, and of its direct dependencies.
*/
* This test is therefore a mix of dlopen/dlclose and dlmopen/dlclose of
* libfoo, and of its direct dependencies.
*/
-int main(
int argc, char **argv
)
+int main(
void
)
{
{
- void *h0, *h1, *h2, *h3, *h4;
+ void *h0, *h2, *h3, *h4;
+
+#ifdef HAVE_DLMOPEN
+ void *h1;
+#endif
+
char *error;
int (*foo)(void);
char *error;
int (*foo)(void);
@@
-21,10
+34,14
@@
int main(int argc, char **argv)
if (!h0) {
goto get_error;
}
if (!h0) {
goto get_error;
}
+
+#ifdef HAVE_DLMOPEN
h1 = dlmopen(LM_ID_BASE, "libfoo.so", RTLD_LAZY);
if (!h1) {
goto get_error;
}
h1 = dlmopen(LM_ID_BASE, "libfoo.so", RTLD_LAZY);
if (!h1) {
goto get_error;
}
+#endif
+
h2 = dlopen("libzzz.so", RTLD_LAZY);
if (!h2) {
goto get_error;
h2 = dlopen("libzzz.so", RTLD_LAZY);
if (!h2) {
goto get_error;
@@
-38,7
+55,7
@@
int main(int argc, char **argv)
goto get_error;
}
goto get_error;
}
- foo = dlsym(h
1
, "foo");
+ foo = dlsym(h
3
, "foo");
error = dlerror();
if (error != NULL) {
goto error;
error = dlerror();
if (error != NULL) {
goto error;
@@
-49,9
+66,13
@@
int main(int argc, char **argv)
if (dlclose(h0)) {
goto get_error;
}
if (dlclose(h0)) {
goto get_error;
}
+
+#ifdef HAVE_DLMOPEN
if (dlclose(h1)) {
goto get_error;
}
if (dlclose(h1)) {
goto get_error;
}
+#endif
+
if (dlclose(h2)) {
goto get_error;
}
if (dlclose(h2)) {
goto get_error;
}
This page took
0.025349 seconds
and
4
git commands to generate.