From: David Goulet <dgoulet@efficios.com>
Date: Tue, 3 Apr 2012 18:45:11 +0000 (-0400)
Subject: Merge branch 'master' into benchmark
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=7cc3c8aee394d98d8c395512d491d8f0c3ad4406;p=lttng-tools.git

Merge branch 'master' into benchmark
---

7cc3c8aee394d98d8c395512d491d8f0c3ad4406
diff --cc .gitignore
index 776aa78ef,b63da96a3..969e75ba5
--- a/.gitignore
+++ b/.gitignore
@@@ -34,14 -35,16 +35,16 @@@ src/bin/lttng-sessiond/lttng-session
  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
+ # Tests
+ test_sessions
+ test_kernel_data_trace
+ test_ust_data_trace
+ kernel_all_events_basic
+ kernel_event_basic
+ ust_global_all_events_basic
+ ust_global_event_basic
+ gen-nevents
+ gen-events-time
+ gen-events
  
 -benchmark/
 +benchmark/bench_sessions