From 439b4c5ecc4b206262ec45fbf4dbac3e3c7632d0 Mon Sep 17 00:00:00 2001
From: Matthew Khouzam <matthew.khouzam@ericsson.com>
Date: Thu, 29 Mar 2012 13:11:14 -0400
Subject: [PATCH] Add a headless test

Conflicts:

	lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java
---
 .../tests/ctfadaptor/headless/Benchmark.java   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java
index a5d214b0f8..ce7e21cf6f 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java
@@ -12,6 +12,10 @@
 package org.eclipse.linuxtools.tmf.core.tests.ctfadaptor.headless;
 
 import java.io.FileNotFoundException;
+<<<<<<< HEAD
+=======
+import java.io.IOException;
+>>>>>>> fe56c70... Added a headless test
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -33,13 +37,13 @@ public class Benchmark {
 
         // Change this to enable text output
         final boolean USE_TEXT = false;
-//
-//        try {
-//            System.in.read();
-//        } catch (IOException e1) {
-//            // TODO Auto-generated catch block
-//            e1.printStackTrace();
-//        }
+
+        try {
+            System.in.read();
+        } catch (IOException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
+        }
         // Work variables
         Long nbEvent = 0L;
         Vector<Double> benchs = new Vector<Double>();
-- 
2.34.1