projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: refuse to run test suite if lttng processes are present
[lttng-tools.git]
/
tests
/
unit
/
test_session.c
diff --git
a/tests/unit/test_session.c
b/tests/unit/test_session.c
index 7242edded9879640cddfd2f408168ecf4b87397b..03e6b91611ad0732fa82faf0c386c252cf0ca4c5 100644
(file)
--- a/
tests/unit/test_session.c
+++ b/
tests/unit/test_session.c
@@
-16,7
+16,6
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#include <assert.h>
#include <errno.h>
#include <stdio.h>
#include <assert.h>
#include <errno.h>
#include <stdio.h>
@@
-25,11
+24,14
@@
#include <unistd.h>
#include <time.h>
#include <sys/types.h>
#include <unistd.h>
#include <time.h>
#include <sys/types.h>
+#include <urcu.h>
#include <tap/tap.h>
#include <bin/lttng-sessiond/session.h>
#include <bin/lttng-sessiond/ust-app.h>
#include <tap/tap.h>
#include <bin/lttng-sessiond/session.h>
#include <bin/lttng-sessiond/ust-app.h>
+#include <bin/lttng-sessiond/ht-cleanup.h>
+#include <bin/lttng-sessiond/health-sessiond.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/common.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/common.h>
@@
-41,11
+43,14
@@
/* Number of TAP tests in this file */
#define NUM_TESTS 11
/* Number of TAP tests in this file */
#define NUM_TESTS 11
+struct health_app *health_sessiond;
static struct ltt_session_list *session_list;
static struct ltt_session_list *session_list;
+static pthread_t ht_cleanup_thread;
-/* For
lttnger
r.h */
+/* For
erro
r.h */
int lttng_opt_quiet = 1;
int lttng_opt_verbose = 0;
int lttng_opt_quiet = 1;
int lttng_opt_verbose = 0;
+int lttng_opt_mi;
int ust_consumerd32_fd;
int ust_consumerd64_fd;
int ust_consumerd32_fd;
int ust_consumerd64_fd;
@@
-108,8
+113,7
@@
static void empty_session_list(void)
struct ltt_session *iter, *tmp;
cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
struct ltt_session *iter, *tmp;
cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
- cds_list_del(&iter->list);
- free(iter);
+ session_destroy(iter);
}
/* Session list must be 0 */
}
/* Session list must be 0 */
@@
-294,8
+298,13
@@
int main(int argc, char **argv)
{
plan_tests(NUM_TESTS);
{
plan_tests(NUM_TESTS);
+ health_sessiond = health_app_create(NR_HEALTH_SESSIOND_TYPES);
+ assert(!init_ht_cleanup_thread(&ht_cleanup_thread));
+
diag("Sessions unit tests");
diag("Sessions unit tests");
+ rcu_register_thread();
+
test_session_list();
test_create_one_session();
test_session_list();
test_create_one_session();
@@
-312,5
+321,8
@@
int main(int argc, char **argv)
test_large_session_number();
test_large_session_number();
+ rcu_unregister_thread();
+ assert(!fini_ht_cleanup_thread(&ht_cleanup_thread));
+
return exit_status();
}
return exit_status();
}
This page took
0.028736 seconds
and
4
git commands to generate.