Fix merge with master

[lttng-tools.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 37f95a4022dcf35e6b384a1bbdedc2c5495b9bbb..776aa78efb241e8a68bdbd3f79ab2fcae0d8de6f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -19,20 +19,29 @@ aclocal.m4
 autom4te.cache/
 config.h
 config.h.in
-config/
 config.log
 config.status
 stamp-h1
 libtool
 tags
 
-ltt-sessiond/ltt-sessiond
-lttng/lttng
-ltt-kconsumerd/ltt-kconsumerd
+# m4 macros not automatically generated
+config/
+!config/epoll.m4
+!config/config_feature.m4
+
+src/bin/lttng-sessiond/lttng-sessiond
+src/bin/lttng/lttng
+src/bin/lttng-consumerd/lttng-consumerd
 
 tests/test_sessions
 tests/test_kernel_data_trace
+tests/test_ust_data_trace
 tests/kernel_all_events_basic
 tests/kernel_event_basic
+tests/ust_global_all_events_basic
+tests/ust_global_event_basic
+tests/ust-nevents/gen-nevents
+tests/ust-nprocesses/gen-events-time
 
 benchmark/bench_sessions