aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2015-01-08 13:24:52 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2015-01-08 13:24:52 +0800
commit6361bdb23ab814c46e61fa5c2f0162534ae0639c (patch)
treec666f12e21743f7e9ca5b3b98a67075cced20fba
parenta5e1ef3af27ec77fa07925937158f7a7867c8c9c (diff)
update files in build
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rwxr-xr-xbuild/lib.linux-x86_64-2.7/lava_android_test/test_definitions/busybox/busybox_test.sh14
-rwxr-xr-xbuild/lib.linux-x86_64-2.7/lava_android_test/test_definitions/cts/cts_wrapper.py7
-rw-r--r--build/lib.linux-x86_64-2.7/lava_android_test/test_definitions/monkey_long_run/juice_package_black_list1
3 files changed, 15 insertions, 7 deletions
diff --git a/build/lib.linux-x86_64-2.7/lava_android_test/test_definitions/busybox/busybox_test.sh b/build/lib.linux-x86_64-2.7/lava_android_test/test_definitions/busybox/busybox_test.sh
index 455a75e..4b3bd4e 100755
--- a/build/lib.linux-x86_64-2.7/lava_android_test/test_definitions/busybox/busybox_test.sh
+++ b/build/lib.linux-x86_64-2.7/lava_android_test/test_definitions/busybox/busybox_test.sh
@@ -18,17 +18,17 @@ test_func(){
fi
}
-rm -r /data/local/tmp/busybox 1>/dev/null 2>/dev/null
+rm -r /data/busybox 1>/dev/null 2>/dev/null
-test_func mkdir /data/local/tmp/busybox
-test_func touch /data/local/tmp/busybox/test.txt
-test_func ls /data/local/tmp/busybox/test.txt
+test_func mkdir /data/busybox
+test_func touch /data/busybox/test.txt
+test_func ls /data/busybox/test.txt
test_func ps
test_func whoami
test_func which busybox
-test_func basename /data/local/tmp/busybox/test.txt
-test_func cp /data/local/tmp/busybox/test.txt /data/local/tmp/busybox/test2.txt
-test_func rm /data/local/tmp/busybox/test2.txt
+test_func basename /data/busybox/test.txt
+test_func cp /data/busybox/test.txt /data/busybox/test2.txt
+test_func rm /data/busybox/test2.txt
test_func dmesg
test_func grep service /init.rc
diff --git a/build/lib.linux-x86_64-2.7/lava_android_test/test_definitions/cts/cts_wrapper.py b/build/lib.linux-x86_64-2.7/lava_android_test/test_definitions/cts/cts_wrapper.py
index deca63c..b035c35 100755
--- a/build/lib.linux-x86_64-2.7/lava_android_test/test_definitions/cts/cts_wrapper.py
+++ b/build/lib.linux-x86_64-2.7/lava_android_test/test_definitions/cts/cts_wrapper.py
@@ -285,6 +285,7 @@ def main():
class_name = None
method_name = None
timeout = 36000
+ force_abi = None
#--cts_pkg cts_package_file --package package_name --timeout 36000
#--cts_pkg cts_package_file --plan plan_name --timeout 36000
if len(sys.argv) > 2:
@@ -311,11 +312,17 @@ def main():
class_name = get_value_from_paras(paras=paras, option='--class')
method_name = get_value_from_paras(paras=paras, option='--method')
+ force_abi = get_value_from_paras(paras=paras, option='--force-abi')
+
run_wrapper_path = os.path.join('./android-cts/tools/cts-tradefed ')
run_wrapper_cmd = "%s" % run_wrapper_path
run_wrapper_cmd = '%s run cts --serial %s' % (run_wrapper_cmd,
adb.get_serial())
+ if force_abi:
+ run_wrapper_cmd = '%s --force-abi %s' % (run_wrapper_cmd,
+ force_abi)
+ print "run_wrapper_cmd=%s" % run_wrapper_cmd
logs = collect_logs()
if not prepare_cts():
sys.exit(1)
diff --git a/build/lib.linux-x86_64-2.7/lava_android_test/test_definitions/monkey_long_run/juice_package_black_list b/build/lib.linux-x86_64-2.7/lava_android_test/test_definitions/monkey_long_run/juice_package_black_list
index 56d6045..8899c05 100644
--- a/build/lib.linux-x86_64-2.7/lava_android_test/test_definitions/monkey_long_run/juice_package_black_list
+++ b/build/lib.linux-x86_64-2.7/lava_android_test/test_definitions/monkey_long_run/juice_package_black_list
@@ -4,3 +4,4 @@ com.android.quicksearchbox
com.android.speechrecorder
com.android.connectivitymanagertest
org.linaro.glmark2
+com.android.gallery3d