summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjihye kim <jihye1128.kim@samsung.com>2013-11-07 13:35:32 +0900
committerjihye kim <jihye1128.kim@samsung.com>2013-11-07 13:35:32 +0900
commit5fe1d1ab3eefd3dfcb98ec00e4aa8ecfead3baec (patch)
tree8f1107b7be5d0d557acd403b5df6af1eb0b416bb
parentc8b6390ff40ff5f2a474a1c3e804cd9ee2de17f1 (diff)
downloademulator-test-5fe1d1ab3eefd3dfcb98ec00e4aa8ecfead3baec.tar.gz
emulator-test-5fe1d1ab3eefd3dfcb98ec00e4aa8ecfead3baec.tar.bz2
emulator-test-5fe1d1ab3eefd3dfcb98ec00e4aa8ecfead3baec.zip
modify cli test command because emulator manager cli options are modified
- modify create vm option -b -> -p and -p -> -c Change-Id: I31076d7d6ce39f3b8a2a49cb836fd201f2e9b156 Signed-off-by: jihye kim <jihye1128.kim@samsung.com>
-rwxr-xr-xintegration/conformance-test/supplement/conformance-test.sh25
-rw-r--r--package/changelog4
-rw-r--r--package/pkginfo.manifest2
3 files changed, 26 insertions, 5 deletions
diff --git a/integration/conformance-test/supplement/conformance-test.sh b/integration/conformance-test/supplement/conformance-test.sh
index 8e06b37..32f1a0f 100755
--- a/integration/conformance-test/supplement/conformance-test.sh
+++ b/integration/conformance-test/supplement/conformance-test.sh
@@ -165,7 +165,7 @@ COMMAND=""
output "# create vm"
output "$ Success"
-COMMAND="create -n ${EMULATOR_NAME} -b 1"
+COMMAND="create -n ${EMULATOR_NAME} -p mobile-3.0"
output "@ ${COMMAND}"
${EMULATOR_MANAGER} ${COMMAND} | tee -a ${RESULT_FILE}
output ""
@@ -186,7 +186,7 @@ output ""
output "# create custom vm"
output "$ Success"
-COMMAND="create -n ${EMULATOR_NAME}2 -p ${CUSTOM_PATH}/emulimg-${EMULATOR_NAME}.x86"
+COMMAND="create -n ${EMULATOR_NAME}2 -c ${CUSTOM_PATH}/emulimg-${EMULATOR_NAME}.x86"
output "@ ${COMMAND}"
${EMULATOR_MANAGER} ${COMMAND} | tee -a ${RESULT_FILE}
output ""
@@ -206,13 +206,30 @@ output ""
output "# modify vm - ram size"
output "$ Success"
-COMMAND="modify -n ${EMULATOR_NAME} --ram-size 512"
+
+case "${UNAME}" in
+ Linux | Darwin)
+ COMMAND="modify -n ${EMULATOR_NAME} --ram-size 768"
+ ;;
+ MINGW*)
+ COMMAND="modify -n ${EMULATOR_NAME} --ram-size 512"
+ ;;
+esac
+
output "@ ${COMMAND}"
${EMULATOR_MANAGER} ${COMMAND} | tee -a ${RESULT_FILE}
output ""
output "# check ram size"
-output "$ 512"
+case "${UNAME}" in
+ Linux | Darwin)
+ output "$ 768"
+ ;;
+ MINGW*)
+ output "$ 512"
+ ;;
+esac
+
COMMAND="detail -n ${EMULATOR_NAME}"
output "@ ${COMMAND}"
${EMULATOR_MANAGER} ${COMMAND} | tee -a ${RESULT_FILE}
diff --git a/package/changelog b/package/changelog
index a577b5b..760c1b7 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+*0.2.2
+- modify command because emulator manager cli option modified
+== jihye kim<jihye1128.kim@samsung.com> 2013-11-07
+
*0.2.1
- add execution mode conformance test script
==jihye kim<jihye1128.kim@samsung.com> 2013-11-05
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index f6e5c30..719d6f5 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
Source: emulator-test
-Version: 0.2.1
+Version: 0.2.2
Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
Package: emulator-test-tools