[Esbox-commits] r1070 - in branches/work_Petr: org.maemo.esbox.maemosdk.core/META-INF org.maemo.esbox.maemosdk.tests org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk
eswartz at garage.maemo.org
eswartz at garage.maemo.org
Sat Dec 13 03:49:10 EET 2008
Author: eswartz
Date: 2008-12-13 03:49:09 +0200 (Sat, 13 Dec 2008)
New Revision: 1070
Removed:
branches/work_Petr/org.maemo.esbox.maemosdk.tests/hs_err_pid6120.log
branches/work_Petr/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/IScratchboxSDKPlatformArchitectureProvider.java
Modified:
branches/work_Petr/org.maemo.esbox.maemosdk.core/META-INF/MANIFEST.MF
branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/AllTests.java
branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchbox2SDK.java
Log:
Merge with rev 1069 from trunk
Modified: branches/work_Petr/org.maemo.esbox.maemosdk.core/META-INF/MANIFEST.MF
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.core/META-INF/MANIFEST.MF 2008-12-13 01:36:49 UTC (rev 1069)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.core/META-INF/MANIFEST.MF 2008-12-13 01:49:09 UTC (rev 1070)
@@ -10,7 +10,6 @@
org.maemo.mica.common.core;bundle-version="2.0.0",
org.maemo.mica.common.project.core;bundle-version="2.0.0",
org.maemo.mica.common.launch;bundle-version="2.0.0",
- org.maemo.mica.protocol.sbrsh;bundle-version="2.0.0",
org.maemo.esbox.scratchbox.core;bundle-version="2.0.0",
org.maemo.mica.maemosdk.core;bundle-version="2.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Deleted: branches/work_Petr/org.maemo.esbox.maemosdk.tests/hs_err_pid6120.log
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.tests/hs_err_pid6120.log 2008-12-13 01:36:49 UTC (rev 1069)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.tests/hs_err_pid6120.log 2008-12-13 01:49:09 UTC (rev 1070)
@@ -1,219 +0,0 @@
-#
-# An unexpected error has been detected by HotSpot Virtual Machine:
-#
-# EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x6d7c76a8, pid=6120, tid=1360
-#
-# Java VM: Java HotSpot(TM) Client VM (1.5.0_12-b04 mixed mode)
-# Problematic frame:
-# V [jvm.dll+0x876a8]
-#
-
---------------- T H R E A D ---------------
-
-Current thread (0x0c497a20): JavaThread "ErrorReader" daemon [_thread_in_vm, id=1360]
-
-siginfo: ExceptionCode=0xc0000005, writing address 0x10bacac8
-
-Registers:
-EAX=0x00003000, EBX=0x10bafc84, ECX=0x10bacac8, EDX=0x10b76060
-ESP=0x10bafad0, EBP=0x10bafb30, ESI=0x00000003, EDI=0x10bafac8
-EIP=0x6d7c76a8, EFLAGS=0x00010202
-
-Top of Stack: (sp=0x10bafad0)
-0x10bafad0: 0c4b8408 0c497a20 6d7c7551 08c46e60
-0x10bafae0: 0c497a20 0c4b83f8 6d795ec3 00000002
-0x10bafaf0: 6d795e65 0c4b8408 0c4b8408 6d80a2f6
-0x10bafb00: 0c4b8408 0c4b8404 0c497a20 10bafb48
-0x10bafb10: 6d80b5b1 0c4b83fc 0c4b8400 0c4b8404
-0x10bafb20: 0c4b8408 00000007 10bafc8c 00cc89c0
-0x10bafb30: 10bafb74 6d81fbb2 0000000a 00000000
-0x10bafb40: 10bafbe4 0c4b83f8 08c46e60 0c497a20
-
-Instructions: (pc=0x6d7c76a8)
-0x6d7c7698: 89 6d 7c 18 e8 67 73 05 00 0f af c6 8b cf 2b c8
-0x6d7c76a8: 83 21 00 46 3b 35 ac 20 89 6d 7e e8 5f 5e c3 8b
-
-
-Stack: [0x10b70000,0x10bb0000), sp=0x10bafad0, free space=254k
-Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-V [jvm.dll+0x876a8]
-V [jvm.dll+0xdfbb2]
-V [jvm.dll+0x8746a]
-V [jvm.dll+0x871c7]
-V [jvm.dll+0xa2048]
-V [jvm.dll+0x1110d8]
-V [jvm.dll+0x1110a6]
-C [MSVCRT.dll+0x2a3b0]
-C [kernel32.dll+0xb683]
-
-
---------------- P R O C E S S ---------------
-
-Java Threads: ( => current thread )
-=>0x0c497a20 JavaThread "ErrorReader" daemon [_thread_in_vm, id=1360]
- 0x0b9d2008 JavaThread "OutputReader" daemon [_thread_in_vm, id=1928]
- 0x0c515600 JavaThread "Connect thread 127.0.0.1 session" [_thread_in_native, id=2920]
- 0x0c47a7f0 JavaThread "ReaderThread" [_thread_in_native, id=3532]
- 0x0be58a70 JavaThread "Worker-5" [_thread_blocked, id=6100]
- 0x0be96288 JavaThread "Worker-4" [_thread_in_vm, id=2996]
- 0x0be58008 JavaThread "Worker-3" [_thread_blocked, id=2388]
- 0x0be96e60 JavaThread "WorkbenchTestable" [_thread_blocked, id=5580]
- 0x0bc97c60 JavaThread "Worker-2" [_thread_blocked, id=5460]
- 0x0bb4d8f8 JavaThread "Worker-1" [_thread_blocked, id=1624]
- 0x0c3258c0 JavaThread "Java indexing" daemon [_thread_blocked, id=1068]
- 0x0bc5d028 JavaThread "Worker-0" [_thread_blocked, id=4548]
- 0x0b272808 JavaThread "Start Level Event Dispatcher" daemon [_thread_blocked, id=3952]
- 0x0b1e7c78 JavaThread "Framework Event Dispatcher" daemon [_thread_blocked, id=3820]
- 0x00c91e78 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=5328]
- 0x00c90c08 JavaThread "CompilerThread0" daemon [_thread_blocked, id=3576]
- 0x00c90010 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=600]
- 0x00c8cbb0 JavaThread "JDWP Command Reader" daemon [_thread_in_native, id=4696]
- 0x00c8bec8 JavaThread "JDWP Event Helper Thread" daemon [_thread_blocked, id=1088]
- 0x003887f0 JavaThread "JDWP Transport Listener: dt_socket" daemon [_thread_blocked, id=2700]
- 0x00c7c090 JavaThread "Finalizer" daemon [_thread_blocked, id=2036]
- 0x00c7ac20 JavaThread "Reference Handler" daemon [_thread_blocked, id=4232]
- 0x00388638 JavaThread "main" [_thread_blocked, id=4380]
-
-Other Threads:
- 0x00c78158 VMThread [id=2424]
- 0x00c93838 WatcherThread [id=5724]
-
-VM state:not at safepoint (normal execution)
-
-VM Mutex/Monitor currently owned by a thread: None
-
-Heap
- def new generation total 3072K, used 410K [0x02cc0000, 0x03010000, 0x031a0000)
- eden space 2752K, 5% used [0x02cc0000, 0x02ce44b0, 0x02f70000)
- from space 320K, 82% used [0x02fc0000, 0x030025e8, 0x03010000)
- to space 320K, 0% used [0x02f70000, 0x02f70000, 0x02fc0000)
- tenured generation total 39716K, used 22943K [0x031a0000, 0x05869000, 0x06cc0000)
- the space 39716K, 57% used [0x031a0000, 0x04807e20, 0x04808000, 0x05869000)
- compacting perm gen total 34560K, used 34441K [0x06cc0000, 0x08e80000, 0x0acc0000)
- the space 34560K, 99% used [0x06cc0000, 0x08e626a8, 0x08e62800, 0x08e80000)
-No shared spaces configured.
-
-Dynamic libraries:
-0x00400000 - 0x0040d000 C:\Program Files\Java\jdk1.5.0_12\jre\bin\javaw.exe
-0x7c900000 - 0x7c9b0000 C:\WINNT\system32\ntdll.dll
-0x7c800000 - 0x7c8f5000 C:\WINNT\system32\kernel32.dll
-0x77dd0000 - 0x77e6b000 C:\WINNT\system32\ADVAPI32.dll
-0x77e70000 - 0x77f02000 C:\WINNT\system32\RPCRT4.dll
-0x77fe0000 - 0x77ff1000 C:\WINNT\system32\Secur32.dll
-0x7e410000 - 0x7e4a0000 C:\WINNT\system32\USER32.dll
-0x77f10000 - 0x77f57000 C:\WINNT\system32\GDI32.dll
-0x77c10000 - 0x77c68000 C:\WINNT\system32\MSVCRT.dll
-0x10000000 - 0x1003e000 C:\WINNT\system32\cahooknt.dll
-0x6d740000 - 0x6d8dd000 C:\Program Files\Java\jdk1.5.0_12\jre\bin\client\jvm.dll
-0x76b40000 - 0x76b6d000 C:\WINNT\system32\WINMM.dll
-0x6d300000 - 0x6d308000 C:\Program Files\Java\jdk1.5.0_12\jre\bin\hpi.dll
-0x76bf0000 - 0x76bfb000 C:\WINNT\system32\PSAPI.DLL
-0x6d400000 - 0x6d435000 C:\Program Files\Java\jdk1.5.0_12\jre\bin\jdwp.dll
-0x6d710000 - 0x6d71c000 C:\Program Files\Java\jdk1.5.0_12\jre\bin\verify.dll
-0x6d380000 - 0x6d39d000 C:\Program Files\Java\jdk1.5.0_12\jre\bin\java.dll
-0x6d730000 - 0x6d73f000 C:\Program Files\Java\jdk1.5.0_12\jre\bin\zip.dll
-0x6d290000 - 0x6d297000 C:\Program Files\Java\jdk1.5.0_12\jre\bin\dt_socket.dll
-0x71ab0000 - 0x71ac7000 C:\WINNT\system32\WS2_32.dll
-0x71aa0000 - 0x71aa8000 C:\WINNT\system32\WS2HELP.dll
-0x751d0000 - 0x751ee000 C:\WINNT\system32\wshbth.dll
-0x77920000 - 0x77a13000 C:\WINNT\system32\SETUPAPI.dll
-0x71a50000 - 0x71a8f000 C:\WINNT\System32\mswsock.dll
-0x76f20000 - 0x76f47000 C:\WINNT\system32\DNSAPI.dll
-0x76fb0000 - 0x76fb8000 C:\WINNT\System32\winrnr.dll
-0x76f60000 - 0x76f8c000 C:\WINNT\system32\WLDAP32.dll
-0x76fc0000 - 0x76fc6000 C:\WINNT\system32\rasadhlp.dll
-0x662b0000 - 0x66308000 C:\WINNT\system32\hnetcfg.dll
-0x71a90000 - 0x71a98000 C:\WINNT\System32\wshtcpip.dll
-0x6d540000 - 0x6d553000 C:\Program Files\Java\jdk1.5.0_12\jre\bin\net.dll
-0x6d560000 - 0x6d569000 C:\Program Files\Java\jdk1.5.0_12\jre\bin\nio.dll
-0x72000000 - 0x72014000 C:\eclipse-3.4.1\eclipse\plugins\org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731\eclipse_1115.dll
-0x5d090000 - 0x5d12a000 C:\WINNT\system32\COMCTL32.dll
-0x77c00000 - 0x77c08000 C:\WINNT\system32\VERSION.dll
-0x0ce80000 - 0x0ced5000 C:\sources\maemo-eclipse\.metadata\.plugins\org.eclipse.pde.core\pde-junit\org.eclipse.osgi\bundles\101\1\.cp\swt-win32-3449.dll
-0x774e0000 - 0x7761d000 C:\WINNT\system32\ole32.dll
-0x77120000 - 0x771ab000 C:\WINNT\system32\OLEAUT32.dll
-0x763b0000 - 0x763f9000 C:\WINNT\system32\comdlg32.dll
-0x77f60000 - 0x77fd6000 C:\WINNT\system32\SHLWAPI.dll
-0x773d0000 - 0x774d3000 C:\WINNT\WinSxS\x86_Microsoft.Windows.Common-Controls_6595b64144ccf1df_6.0.2600.2982_x-ww_ac3f9c03\COMCTL32.dll
-0x7c9c0000 - 0x7d1d7000 C:\WINNT\system32\SHELL32.dll
-0x76390000 - 0x763ad000 C:\WINNT\system32\IMM32.dll
-0x74d90000 - 0x74dfb000 C:\WINNT\system32\USP10.dll
-0x771b0000 - 0x7725a000 C:\WINNT\system32\WININET.dll
-0x77a80000 - 0x77b14000 C:\WINNT\system32\CRYPT32.dll
-0x77b20000 - 0x77b32000 C:\WINNT\system32\MSASN1.dll
-0x5ad70000 - 0x5ada8000 C:\WINNT\system32\uxtheme.dll
-0x74720000 - 0x7476b000 C:\WINNT\system32\MSCTF.dll
-0x63000000 - 0x63014000 C:\WINNT\system32\SynTPFcs.dll
-0x0d520000 - 0x0d534000 C:\sources\maemo-eclipse\.metadata\.plugins\org.eclipse.pde.core\pde-junit\org.eclipse.osgi\bundles\101\1\.cp\swt-gdip-win32-3449.dll
-0x4ec50000 - 0x4edf6000 C:\WINNT\WinSxS\x86_Microsoft.Windows.GdiPlus_6595b64144ccf1df_1.0.2600.3352_x-ww_81af8e88\gdiplus.dll
-0x74c80000 - 0x74cac000 C:\WINNT\system32\oleacc.dll
-0x76080000 - 0x760e5000 C:\WINNT\system32\MSVCP60.dll
-0x20000000 - 0x202c5000 C:\WINNT\system32\xpsp2res.dll
-0x76fd0000 - 0x7704f000 C:\WINNT\system32\CLBCATQ.DLL
-0x77050000 - 0x77115000 C:\WINNT\system32\COMRes.dll
-0x7e290000 - 0x7e401000 C:\WINNT\system32\shdocvw.dll
-0x754d0000 - 0x75550000 C:\WINNT\system32\CRYPTUI.dll
-0x76c30000 - 0x76c5e000 C:\WINNT\system32\WINTRUST.dll
-0x76c90000 - 0x76cb8000 C:\WINNT\system32\IMAGEHLP.dll
-0x5b860000 - 0x5b8b4000 C:\WINNT\system32\NETAPI32.dll
-0x77b40000 - 0x77b62000 C:\WINNT\system32\appHelp.dll
-0x75e90000 - 0x75f40000 C:\WINNT\system32\SXS.DLL
-0x0e450000 - 0x0e716000 C:\WINNT\system32\msi.dll
-0x7e1e0000 - 0x7e282000 C:\WINNT\system32\urlmon.dll
-0x0e780000 - 0x0e808000 C:\WINNT\system32\shdoclc.dll
-0x7dc30000 - 0x7df23000 C:\WINNT\system32\mshtml.dll
-0x746c0000 - 0x746e7000 C:\WINNT\system32\msls31.dll
-0x75cf0000 - 0x75d81000 C:\WINNT\system32\MLANG.dll
-0x76380000 - 0x76385000 C:\WINNT\system32\msimg32.dll
-0x746f0000 - 0x7471a000 C:\WINNT\system32\msimtf.dll
-0x75c50000 - 0x75cbf000 C:\WINNT\system32\jscript.dll
-0x6bdd0000 - 0x6be06000 C:\WINNT\system32\dxtrans.dll
-0x76b20000 - 0x76b31000 C:\WINNT\system32\ATL.DLL
-0x0f8e0000 - 0x0f8ea000 C:\WINNT\system32\ddrawex.dll
-0x73760000 - 0x737a9000 C:\WINNT\system32\DDRAW.dll
-0x73bc0000 - 0x73bc6000 C:\WINNT\system32\DCIMAN32.dll
-0x6be10000 - 0x6be6a000 C:\WINNT\system32\dxtmsft.dll
-0x66880000 - 0x6688c000 C:\WINNT\system32\IMGUTIL.DLL
-0x5e310000 - 0x5e31c000 C:\WINNT\system32\pngfilt.dll
-0x0fea0000 - 0x0feaf000 C:\sources\maemo-eclipse\.metadata\.plugins\org.eclipse.pde.core\pde-junit\org.eclipse.osgi\bundles\149\1\.cp\jWinHttp.dll
-0x4d4f0000 - 0x4d548000 C:\WINNT\system32\WINHTTP.dll
-0x104f0000 - 0x10518000 C:\WINNT\system32\rsaenh.dll
-0x769c0000 - 0x76a73000 C:\WINNT\system32\USERENV.dll
-0x0b5c0000 - 0x0b5c8000 C:\sources\maemo-eclipse\.metadata\.plugins\org.eclipse.pde.core\pde-junit\org.eclipse.osgi\bundles\83\1\.cp\os\win32\x86\localfile_1_0_0.dll
-0x6eec0000 - 0x6eee1000 C:\eclipse-3.4.1\eclipse\plugins\org.tigris.subversion.clientadapter.javahl.win32_1.5.3\libapr-1.dll
-0x106d0000 - 0x107da000 C:\eclipse-3.4.1\eclipse\plugins\org.tigris.subversion.clientadapter.javahl.win32_1.5.3\libeay32.dll
-0x71ad0000 - 0x71ad9000 C:\WINNT\system32\WSOCK32.dll
-0x13000000 - 0x130c4000 C:\eclipse-3.4.1\eclipse\plugins\org.tigris.subversion.clientadapter.javahl.win32_1.5.3\libdb44.dll
-0x10670000 - 0x106a1000 C:\eclipse-3.4.1\eclipse\plugins\org.tigris.subversion.clientadapter.javahl.win32_1.5.3\ssleay32.dll
-0x6ee60000 - 0x6ee8a000 C:\eclipse-3.4.1\eclipse\plugins\org.tigris.subversion.clientadapter.javahl.win32_1.5.3\libaprutil-1.dll
-0x107e0000 - 0x107f2000 C:\eclipse-3.4.1\eclipse\plugins\org.tigris.subversion.clientadapter.javahl.win32_1.5.3\intl3_svn.dll
-0x10800000 - 0x10915000 C:\eclipse-3.4.1\eclipse\plugins\org.tigris.subversion.clientadapter.javahl.win32_1.5.3\dbghelp.dll
-0x10a20000 - 0x10a72000 C:\eclipse-3.4.1\eclipse\plugins\org.tigris.subversion.clientadapter.javahl.win32_1.5.3\libsvn_subr-1.dll
-0x76780000 - 0x76789000 C:\WINNT\system32\SHFOLDER.dll
-0x10a80000 - 0x10a96000 C:\eclipse-3.4.1\eclipse\plugins\org.tigris.subversion.clientadapter.javahl.win32_1.5.3\libsvn_delta-1.dll
-0x10aa0000 - 0x10aad000 C:\eclipse-3.4.1\eclipse\plugins\org.tigris.subversion.clientadapter.javahl.win32_1.5.3\libsvn_diff-1.dll
-
-VM Arguments:
-jvm_args: -agentlib:jdwp=transport=dt_socket,suspend=y,address=localhost:1101 -Declipse.pde.launch=true -Declipse.p2.data.area=@config.dir\p2 -Dfile.encoding=Cp1252
-java_command: org.eclipse.equinox.launcher.Main -os win32 -ws win32 -arch x86 -nl en_US -version 3 -port 1100 -testLoaderClass org.eclipse.jdt.internal.junit4.runner.JUnit4TestLoader -loaderpluginname org.eclipse.jdt.junit4.runtime -classNames org.maemo.esbox.scratchbox.tests.ESboxProductTestSuite -application org.eclipse.pde.junit.runtime.uitestapplication -product org.eclipse.sdk.ide -data C:\sources\maemo-eclipse/../junit-workspace -configuration file:C:/sources/maemo-eclipse/.metadata/.plugins/org.eclipse.pde.core/pde-junit/ -dev file:C:/sources/maemo-eclipse/.metadata/.plugins/org.eclipse.pde.core/pde-junit/dev.properties -os win32 -ws win32 -arch x86 -nl en_US -testpluginname org.maemo.esbox.scratchbox.tests
-Launcher Type: SUN_STANDARD
-
-Environment Variables:
-CLASSPATH=.;C:\Program Files\Java\jre1.6.0_03\lib\ext\QTJava.zip
-PATH=C:\Program Files\Java\jdk1.5.0_12\jre\bin;C:/Program Files/Java/jre1.6.0_03/bin/client;C:/Program Files/Java/jre1.6.0_03/bin;C:\Program Files\Common Files\Symbian\Tools;C:\Program Files\PC Connectivity Solution\;c:\apps\rvct22_616\bin;4.553193E+219POCROOT4.556791e+219poc32\tools;9.080440E-315POCROOT3.931419e+219poc32\gcc\bin;C:\Perl\bin\;C:\Program Files\ThinkPad\Utilities;C:\WINNT\system32;C:\WINNT;C:\WINNT\System32\Wbem;c:\Program Files\ATI Technologies\ATI.ACE\;C:\Program Files\Intel\Wireless\Bin;C:\Program Files\Common Files\GTK\2.0\bin;C:\Program Files\Nokia\CodeWarrior for Symbian v3.1\Bin;C:\Symbian\UIQ3.1SDK\epoc32\tools\nokia_compiler\Symbian_Tools\Command_Line_Tools;C:\PROGRA~1\PuTTY;C:\Program Files\QuickTime\QTSystem\;
-USERNAME=eswartz
-OS=Windows_NT
-PROCESSOR_IDENTIFIER=x86 Family 6 Model 15 Stepping 6, GenuineIntel
-
-
-
---------------- S Y S T E M ---------------
-
-OS: Windows XP Build 2600 Service Pack 2
-
-CPU:total 2 (cores per cpu 2, threads per core 1) family 6 model 15 stepping 6, cmov, cx8, fxsr, mmx, sse, sse2
-
-Memory: 4k page, physical 2095448k(360176k free), swap 1942156k(5192k free)
-
-vm_info: Java HotSpot(TM) Client VM (1.5.0_12-b04) for windows-x86, built on May 2 2007 02:07:59 by "java_re" with MS VC++ 6.0
-
Modified: branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/AllTests.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/AllTests.java 2008-12-13 01:36:49 UTC (rev 1069)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/AllTests.java 2008-12-13 01:49:09 UTC (rev 1070)
@@ -33,6 +33,7 @@
suite.addTestSuite(TestResetTargetCommand.class);
suite.addTestSuite(TestScratchboxCommand.class);
suite.addTestSuite(TestListCommands.class);
+ suite.addTestSuite(TestScratchbox2SDK.class);
suite.addTestSuite(TestRemoveSb2Command.class);
suite.addTestSuite(TestSimpleCommand.class);
suite.addTestSuite(TestCreateTargetCommand.class);
Modified: branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchbox2SDK.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchbox2SDK.java 2008-12-13 01:36:49 UTC (rev 1069)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchbox2SDK.java 2008-12-13 01:49:09 UTC (rev 1070)
@@ -14,7 +14,7 @@
import java.util.List;
import java.util.Set;
-import org.maemo.esbox.internal.api.scratchbox.core.sdk.IScratchboxSDKPlatformArchitectureProvider;
+import org.maemo.esbox.internal.scratchbox.sb2.core.Scratchbox2SDK;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
import org.maemo.esbox.scratchbox.sb2.sdk.MaemoRootstrap;
import org.maemo.mica.common.core.sdk.ISDKPlatform;
@@ -52,32 +52,33 @@
public void testAvailableMaemoRootstraps() throws Exception {
List<MaemoRootstrap> rootstraps = sb2Sdk.getAvailableMaemoRootstraps(sb2Sdk.getMachine());
- assertTrue("Available rootstrap list is not same as predefined possible rootstraps list.",
- rootstraps.containsAll(possibleRootstraps) && rootstraps.size()==possibleRootstraps.size());
-
+ // FIXME: tests must not depend so strictly on external state
+ //assertTrue("Available rootstrap list is not same as predefined possible rootstraps list.",
+ // rootstraps.containsAll(possibleRootstraps) && rootstraps.size()==possibleRootstraps.size());
+ assertTrue(rootstraps.size() > 2);
}
public void testGetArchitecture() throws Exception {
- IScratchboxSDKPlatformArchitectureProvider
- provider = (IScratchboxSDKPlatformArchitectureProvider)sb2Sdk;
- assertEquals(IScratchboxSDKTarget.ARCHITECTURE_ARMEL,provider.getArchitecture("diablo41_armel"));
- assertEquals(IScratchboxSDKTarget.ARCHITECTURE_UNKNOWN,provider.getArchitecture("WRONG_TARGET"));
+ Scratchbox2SDK sdk = (Scratchbox2SDK) sb2Sdk;
+ assertEquals(IScratchboxSDKTarget.ARCHITECTURE_ARMEL,sdk.getArchitecture("diablo41_armel"));
+ assertEquals(IScratchboxSDKTarget.ARCHITECTURE_UNKNOWN,sdk.getArchitecture("WRONG_TARGET"));
}
public void testGetPlatform() throws Exception {
- ISDKPlatform platform = sb2Sdk.getPlatform("diablo41_armel");
+ Scratchbox2SDK sdk = (Scratchbox2SDK) sb2Sdk;
+ ISDKPlatform platform = sdk.getPlatform("diablo41_armel");
assertEquals("Diablo", platform.getName());
assertEquals("4.1", platform.getVersion());
- platform = sb2Sdk.getPlatform("diablo41_x86");
+ platform = sdk.getPlatform("diablo41_x86");
assertEquals("Diablo", platform.getName());
assertEquals("4.1", platform.getVersion());
- platform = sb2Sdk.getPlatform("diablo41_i386");
+ platform = sdk.getPlatform("diablo41_i386");
assertEquals("Diablo", platform.getName());
assertEquals("4.1", platform.getVersion());
- platform = sb2Sdk.getPlatform("diablo4.1.1_armel");
+ platform = sdk.getPlatform("diablo4.1.1_armel");
assertEquals("Diablo", platform.getName());
assertEquals("4.1.1", platform.getVersion());
Deleted: branches/work_Petr/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/IScratchboxSDKPlatformArchitectureProvider.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/IScratchboxSDKPlatformArchitectureProvider.java 2008-12-13 01:36:49 UTC (rev 1069)
+++ branches/work_Petr/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/IScratchboxSDKPlatformArchitectureProvider.java 2008-12-13 01:49:09 UTC (rev 1070)
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-package org.maemo.esbox.internal.api.scratchbox.core.sdk;
-
-import org.maemo.mica.common.core.sdk.ISDKPlatform;
-
-/**
- * Helper interface to identify the platform and architecture
- *
- * @author eswartz
- * @deprecated see IPlatformDetectorAdapter and SDKFactory#establishPlatform()
- *
- */
-public interface IScratchboxSDKPlatformArchitectureProvider {
- /**
- * Identify the platform for the target
- *
- * @param sdk
- * the SDK
- * @param target
- * the target name
- */
- ISDKPlatform getPlatform(String target);
-
- /**
- * Identify the architecture for the target
- *
- * @param sdk
- * the SDK
- * @param target
- * the target name
- */
- String getArchitecture(String target);
-}
More information about the Esbox-commits
mailing list