Merge branch 'master' into benchmark

[lttng-tools.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 280be42f3b20469d4e463709e87c46af0c4d419f..37f95a4022dcf35e6b384a1bbdedc2c5495b9bbb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,6 @@ ltt-kconsumerd/ltt-kconsumerd
 tests/test_sessions
 tests/test_kernel_data_trace
 tests/kernel_all_events_basic
+tests/kernel_event_basic
+
+benchmark/bench_sessions