[Title] Merge from develop

[Type]
[Module] Emulator/
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/test/tizen_vms/x86/test2/test2.xml b/test/tizen_vms/x86/test2/test2.xml
index 4458635..d30cbac 100644 (file)
--- a/test/tizen_vms/x86/test2/test2.xml
+++ b/test/tizen_vms/x86/test2/test2.xml
@@ -20,10 +20,13 @@
     <device>
         <display>
             <resolution>
-                <width>1024</width>
+                <width>480</width>
                 <height>800</height>
             </resolution>
-            <density unit="dpi">2070</density>
+            <density unit="dpi">207</density>
+            <skinPath>
+                <path>emul_480x800</path>
+            </skinPath>
         </display>
         <storage>
             <SDCard/>

diff --git a/test/tizen_vms/x86/test3/test3.xml b/test/tizen_vms/x86/test3/test3.xml
index 8ea494e..ebeb450 100644 (file)
--- a/test/tizen_vms/x86/test3/test3.xml
+++ b/test/tizen_vms/x86/test3/test3.xml
@@ -1,35 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EmulatorConfiguration xmlns="http://www.tizen.org/em" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.tizen.org/em ../xsd/em.xsd ">
-  <baseInformation>
-    <name>test3</name>
-    <architecture>x86</architecture>
-    <diskImage type="standard" version="1.0">
-      <baseDiskImage format="qcow2">baseDiskImage</baseDiskImage>
-      <currentDiskImage format="qcow2">currentDiskImage</currentDiskImage>
-    </diskImage>
-  </baseInformation>
-  <usability>
-    <logging>
-      <level>NONE</level>
-    </logging>
-    <fileSharing>
-      <path>path</path>
-    </fileSharing>
-    <hwVirtualization>true</hwVirtualization>
-  </usability>
-  <device>
-    <display>
-      <resolution>
-        <width>720</width>
-        <height>1280</height>
-      </resolution>
-      <density unit="dpi">2070</density>
-    </display>
-    <storage>
-      <SDCard/>
-    </storage>
-    <RAM>
-      <size unit="MiB">512</size>
-    </RAM>
-  </device>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<EmulatorConfiguration xmlns="http://www.tizen.org/em">
+    <baseInformation>
+        <name>test3</name>
+        <architecture>x86</architecture>
+        <diskImage version="1.0" type="standard">
+            <baseDiskImage format="qcow2">baseDiskImage</baseDiskImage>
+            <currentDiskImage format="qcow2">currentDiskImage</currentDiskImage>
+        </diskImage>
+    </baseInformation>
+    <usability>
+        <logging>
+            <level>NONE</level>
+        </logging>
+        <fileSharing>
+            <path>path</path>
+        </fileSharing>
+        <hwVirtualization>true</hwVirtualization>
+    </usability>
+    <device>
+        <display>
+            <resolution>
+                <width>600</width>
+                <height>1024</height>
+            </resolution>
+            <density unit="dpi">224</density>
+            <skinPath>
+                <path>emul_600x1024</path>
+            </skinPath>
+        </display>
+        <storage>
+            <SDCard/>
+        </storage>
+        <RAM>
+            <size unit="MiB">512</size>
+        </RAM>
+    </device>
 </EmulatorConfiguration>