[156247] Preparation work for LTTng/TMF automated testing in Linux Tools build system.

diff --git a/org.eclipse.linuxtools.lttng-feature/feature.xml b/org.eclipse.linuxtools.lttng-feature/feature.xml
index 05a8a4c4a67428ff17449bbcb736d88887b993cf..46f1c0f1fd3a86965600b251fd659d7b34b916f0 100644 (file)
--- a/org.eclipse.linuxtools.lttng-feature/feature.xml
+++ b/org.eclipse.linuxtools.lttng-feature/feature.xml
@@ -20,6 +20,14 @@
 
    <requires>
       <import feature="org.eclipse.linuxtools.tmf" version="0.2.0.qualifier" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.linuxtools.tmf" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf.ui" version="0.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng" version="0.2.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/org.eclipse.linuxtools.lttng.ui.tests/build.properties b/org.eclipse.linuxtools.lttng.ui.tests/build.properties
index aa1a0082691202e9c8cc650976d2b2d128cae35b..33230c0457433436b076e9c0884002275ecff8a1 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui.tests/build.properties
+++ b/org.eclipse.linuxtools.lttng.ui.tests/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.properties
+               plugin.properties,\
+               test.xml

diff --git a/org.eclipse.linuxtools.lttng/plugin.properties b/org.eclipse.linuxtools.lttng/plugin.properties
index 8ac8e39197a8114669346fe041d7deb70007cac1..da1d0fbac83c9fa01ccef6c96da87c9b99308a3e 100644 (file)
--- a/org.eclipse.linuxtools.lttng/plugin.properties
+++ b/org.eclipse.linuxtools.lttng/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.lttng
 Bundle-Vendor = Eclipse
-Bundle-Name = Linux Tracing Toolkit (LTTng)
\ No newline at end of file
+Bundle-Name = LTTng - Linux Tracing Toolkit (Incubation)
\ No newline at end of file

diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java
index 59588eefa7582a4e00259d78f949b289bd4f626b..96eb50dd49614e658df48d2666181bed99dc30de 100644 (file)
--- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java
+++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/TraceDebug.java
@@ -116,6 +116,24 @@ public class TraceDebug {
                return null;\r
        }\r
 \r
+       public static boolean setDEBUG(boolean newValue) {\r
+               boolean oldValue = DEBUG;\r
+               DEBUG = newValue;\r
+               return oldValue;\r
+       }\r
+\r
+       public static boolean setINFO(boolean newValue) {\r
+               boolean oldValue = INFO;\r
+               INFO = newValue;\r
+               return oldValue;\r
+       }\r
+\r
+       public static boolean setWARN(boolean newValue) {\r
+               boolean oldValue = WARN;\r
+               WARN = newValue;\r
+               return oldValue;\r
+       }\r
+\r
        public static boolean isDEBUG() {\r
                return DEBUG;\r
        }\r

diff --git a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java
index 04964f70ce7a8662d623bc15b4ce69d65247bb8e..81ad12f298cda448089421cf8e6e642347fa36c2 100644 (file)
--- a/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java
+++ b/org.eclipse.linuxtools.lttng/src/org/eclipse/linuxtools/lttng/state/StateStacksHandler.java
@@ -66,7 +66,7 @@ public class StateStacksHandler {
        }
 
 
-       void processEvent(TmfEvent tmfEvent) /* throws LttngStateException */{
+       protected void processEvent(TmfEvent tmfEvent) /* throws LttngStateException */{
                if (tmfEvent == null) {
                        return;
                }

diff --git a/org.eclipse.linuxtools.tmf-feature/feature.xml b/org.eclipse.linuxtools.tmf-feature/feature.xml
index 1374a505d2406fd2a00d7bd4cf06c4b014f2eb1c..89c014cf43f425c65abc25ad2dbe10541f72a0c3 100644 (file)
--- a/org.eclipse.linuxtools.tmf-feature/feature.xml
+++ b/org.eclipse.linuxtools.tmf-feature/feature.xml
@@ -17,6 +17,12 @@
       %license
    </license>
 
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.linuxtools.tmf" version="0.2.0" match="greaterOrEqual"/>
+   </requires>
+
    <plugin
          id="org.eclipse.linuxtools.tmf"
          download-size="0"

diff --git a/org.eclipse.linuxtools.tmf.ui.tests/build.properties b/org.eclipse.linuxtools.tmf.ui.tests/build.properties
index aa1a0082691202e9c8cc650976d2b2d128cae35b..33230c0457433436b076e9c0884002275ecff8a1 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui.tests/build.properties
+++ b/org.eclipse.linuxtools.tmf.ui.tests/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.properties
+               plugin.properties,\
+               test.xml

diff --git a/org.eclipse.linuxtools.tmf/plugin.properties b/org.eclipse.linuxtools.tmf/plugin.properties
index b4c214aa720917ccb684cbf5446b566acfb4b3e4..7e2b3cb979872cc52ad032bd4ea82c014dd5c552 100644 (file)
--- a/org.eclipse.linuxtools.tmf/plugin.properties
+++ b/org.eclipse.linuxtools.tmf/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.linuxtools.tmf
 Bundle-Vendor = Eclipse
-Bundle-Name = Tracing and Monitoring Framework (TMF)
\ No newline at end of file
+Bundle-Name = TMF - Tracing and Monitoring Framework (Incubation)
\ No newline at end of file