[Esbox-commits] r1969 - in trunk: org.maemo.esbox.launch.analysis org.maemo.esbox.tests/src/org/maemo/esbox/tests/common

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-08-19 01:02:11 +0300 (Wed, 19 Aug 2009)
New Revision: 1969

Modified:
   trunk/org.maemo.esbox.launch.analysis/plugin.xml
   trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/common/TestOProfileValgrindSupport.java
Log:
Merge revs 1962:1968 from work_Ed branch

Modified: trunk/org.maemo.esbox.launch.analysis/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/plugin.xml	2009-08-18 18:28:08 UTC (rev 1968)
+++ trunk/org.maemo.esbox.launch.analysis/plugin.xml	2009-08-18 22:02:11 UTC (rev 1969)
@@ -205,6 +205,9 @@
                         <test
                               forcePluginActivation="true"
                               property="org.maemo.mica.maemosdk.isEmulatorTarget"/>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.maemosdk.isX86Target"/>
                        <test
                           	  forcePluginActivation="true"
                           	  property="org.maemo.mica.cpp.isCppLaunchable"/>
@@ -474,6 +477,9 @@
 		                    <test
 	                              forcePluginActivation="true"
 	                              property="org.maemo.mica.maemosdk.isEmulatorTarget"/>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.maemosdk.isX86Target"/>
 	                       <test
 	                          	forcePluginActivation="true"
 	                          	property="org.maemo.mica.python.isPythonLaunchable"/>

Modified: trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/common/TestOProfileValgrindSupport.java
===================================================================
--- trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/common/TestOProfileValgrindSupport.java	2009-08-18 18:28:08 UTC (rev 1968)
+++ trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/common/TestOProfileValgrindSupport.java	2009-08-18 22:02:11 UTC (rev 1969)
@@ -17,11 +17,14 @@
 import org.junit.Test;
 import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
 import org.maemo.esbox.scratchbox.core.sdk.ScratchboxSDKFacade;
+import org.maemo.mica.common.analysis.adapters.ILtraceSupportAdapter;
 import org.maemo.mica.common.analysis.adapters.IOProfileSupportAdapter;
 import org.maemo.mica.common.analysis.adapters.IValgrindSupportAdapter;
 import org.maemo.mica.common.core.machine.IMachine;
 import org.maemo.mica.common.core.sdk.ISDKTarget;
 import org.maemo.mica.common.core.tests.TestUtils;
+import org.maemo.mica.internal.api.common.core.sdk.MachineSDK;
+import org.maemo.mica.internal.api.common.core.sdk.MachineSDKTarget;
 import org.maemo.mica.internal.api.protocol.ssh.DeviceSSHLinuxMachine;
 import org.maemo.mica.protocol.ssh.SSHConfiguration;
 
@@ -40,18 +43,21 @@
 		for (ISDKTarget sdkTarget : ScratchboxSDKFacade.getInstance().getScratchboxSDKTargets()) {
 			IOProfileSupportAdapter oprofileSupport = (IOProfileSupportAdapter) sdkTarget.getAdapter(IOProfileSupportAdapter.class);
 			IValgrindSupportAdapter valgrindSupportAdapter = (IValgrindSupportAdapter) sdkTarget.getAdapter(IValgrindSupportAdapter.class);
+			ILtraceSupportAdapter ltraceAdapter = (ILtraceSupportAdapter) sdkTarget.getAdapter(ILtraceSupportAdapter.class);
 			if (TestUtils.isSupportedSDKTarget(sdkTarget)) {
 				assertNotNull(sdkTarget.getName(), oprofileSupport);
 				assertNotNull(sdkTarget.getName(), valgrindSupportAdapter);
+				assertNotNull(sdkTarget.getName(), ltraceAdapter);
 				
-				IMachine machine = sdkTarget.getMachine();
 				if (sdkTarget.getArchitecture().equals(IScratchboxSDKTarget.ARCHITECTURE_ARMEL)) {
 					armelTarget = sdkTarget;
-					assertNotNull(oprofileSupport.validateSupport(machine));	// not a device
-					assertNotNull(valgrindSupportAdapter.validateSupport(machine));	// no ARMEL port of valgrind known
+					assertNotNull(oprofileSupport.validateSupport(armelTarget));	// not a device
+					assertNotNull(valgrindSupportAdapter.validateSupport(armelTarget));	// no ARMEL port of valgrind known
+					assertNotNull(ltraceAdapter.validateSupport(armelTarget));	// no ARMEL support on emulator
 				} else if (sdkTarget.getArchitecture().equals(IScratchboxSDKTarget.ARCHITECTURE_X86)) {
-					assertNotNull(oprofileSupport.validateSupport(machine));	// not a device
-					assertNull(valgrindSupportAdapter.validateSupport(machine));
+					assertNotNull(oprofileSupport.validateSupport(sdkTarget));	// not a device
+					assertNull(valgrindSupportAdapter.validateSupport(sdkTarget)); // only supported on emulator
+					assertNull(ltraceAdapter.validateSupport(sdkTarget)); // works here 
 				}
 			}
 		}
@@ -59,16 +65,28 @@
 		if (armelTarget != null) {
 			SSHConfiguration sshConfig = new SSHConfiguration();
 			IMachine machine = new DeviceSSHLinuxMachine("foo", sshConfig, null); 
-			
+			ISDKTarget machineTarget = new MachineSDKTarget(new MachineSDK(
+					machine, "0.0", "foo"));
+
 			IOProfileSupportAdapter oprofileSupport = (IOProfileSupportAdapter) armelTarget.getAdapter(IOProfileSupportAdapter.class);
 			IValgrindSupportAdapter valgrindSupportAdapter = (IValgrindSupportAdapter) armelTarget.getAdapter(IValgrindSupportAdapter.class);
+			ILtraceSupportAdapter ltraceSupportAdapter = (ILtraceSupportAdapter) armelTarget.getAdapter(ILtraceSupportAdapter.class);
 			
 			assertNotNull(oprofileSupport);
 			assertNotNull(valgrindSupportAdapter);
+			assertNotNull(ltraceSupportAdapter);
 			
-			assertNotNull(valgrindSupportAdapter.validateSupport(machine));  // no ARMEL port of valgrind known
-			assertNull(oprofileSupport.validateSupport(machine));  // device launch
+			assertNotNull(valgrindSupportAdapter.validateSupport(armelTarget));  // no ARMEL port of valgrind known
+			assertNotNull(oprofileSupport.validateSupport(armelTarget));  // emulator launch
+			assertNotNull(ltraceSupportAdapter.validateSupport(armelTarget));  // emulator launch
+			
+			assertNotNull(valgrindSupportAdapter.validateSupport(machineTarget)); // machine does not support it
+			assertNull(oprofileSupport.validateSupport(machineTarget)); // machine should support it
+			assertNull(ltraceSupportAdapter.validateSupport(machineTarget)); // machine should support it
 		}
+		
+
+				
 	}
 
 }