summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMatthew Khouzam2012-03-29 13:11:14 (EDT)
committer Francois Chouinard2012-04-16 14:20:19 (EDT)
commit5e260bf62b056088f0862337d0ab95c6b0ca3d12 (patch)
tree0897389bbb5975adcafe6eb5bc9e28dd353813b3
parentf92741bd358479a51bc4ab56fb10f953a52cb6bd (diff)
downloadorg.eclipse.linuxtools-5e260bf62b056088f0862337d0ab95c6b0ca3d12.zip
org.eclipse.linuxtools-5e260bf62b056088f0862337d0ab95c6b0ca3d12.tar.gz
org.eclipse.linuxtools-5e260bf62b056088f0862337d0ab95c6b0ca3d12.tar.bz2
Add a headless test
Conflicts: lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java18
1 files changed, 11 insertions, 7 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java
index a5d214b..ce7e21c 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/headless/Benchmark.java
+++ b/lttng/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>();