Merge lp:~liuyq0307/lava-android-test/removing-external-tools into lp:lava-android-test

[Yongqin Liu]

remove the external tools from lava-android-test source, and changed to use the command built into android by default.
so this branch depends on the change of android source :http://review.android.git.linaro.org/#change,1322

[Paul Larson (pwlars)]

+1

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2011-11-21 04:00:57 +0000
+++ MANIFEST.in	2011-12-30 08:23:23 +0000
@@ -1,8 +1,6 @@
 include COPYING
 include README
 include .testr.conf
-include external/lavatools/*
-include external/screencap/* 
 include lava_android_test/test_definitions/monkey/*
 include lava_android_test/test_definitions/android-0xbenchmark/*
 include lava_android_test/test_definitions/busybox/*

=== removed directory 'external'
=== removed file 'external/__init__.py'
--- external/__init__.py	2011-10-31 06:40:33 +0000
+++ external/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-

=== removed directory 'external/lavatools'
=== removed file 'external/lavatools/lavatools.jar'
Binary files external/lavatools/lavatools.jar	2011-10-19 06:05:16 +0000 and external/lavatools/lavatools.jar	1970-01-01 00:00:00 +0000 differ
=== removed directory 'external/screencap'
=== removed file 'external/screencap/screencap'
Binary files external/screencap/screencap	2011-10-19 08:30:26 +0000 and external/screencap/screencap	1970-01-01 00:00:00 +0000 differ
=== modified file 'lava_android_test/swprofile.py'
--- lava_android_test/swprofile.py	2011-10-20 13:33:36 +0000
+++ lava_android_test/swprofile.py	2011-12-30 08:23:23 +0000
@@ -58,16 +58,10 @@
 def get_package_info(adb=ADB()):
 
     packages_info = []
-    config = get_config()
-    curdir = os.path.realpath(os.path.dirname(__file__))
-    lavatool_path = os.path.join(os.path.dirname(curdir), 'external', 'lavatools')
-    lavatool_jar = 'lavatools.jar'
-    target_path = os.path.join(config.tempdir_android, lavatool_jar)
-    adb.push(os.path.join(lavatool_path, lavatool_jar), target_path)
-    pkginfo = adb.get_shellcmdoutput('CLASSPATH=%s exec app_process /system/bin org.linaro.lavatools.LavaTools list-packages' % target_path)[1]
+    pkginfo = adb.get_shellcmdoutput('/system/bin/pm list packages -v')[1]
     if pkginfo is None:
         return packages_info
-    pattern = re.compile('^\s*(?P<package_name>[^:]+?)\s*:\s*(?P<version>[^\s].+)\s*$', re.M)
+    pattern = re.compile('^\s*package:\s*(?P<package_name>[^:]+?)\s*:\s*(?P<version>[^\s].+)\s*$', re.M)
     for line in pkginfo:
         match = pattern.search(line)
         if match :

=== modified file 'lava_android_test/testdef.py'
--- lava_android_test/testdef.py	2011-11-14 12:05:55 +0000
+++ lava_android_test/testdef.py	2011-12-30 08:23:23 +0000
@@ -156,12 +156,7 @@
         return result_id
 
     def _screencap(self, resultsdir):
-        config = get_config()
-        curdir = os.path.realpath(os.path.dirname(__file__))
-        screencap_path = os.path.join(os.path.dirname(curdir), 'external', 'screencap', 'screencap')
-        target_path = os.path.join(config.tempdir_android, 'screencap')
-        self.adb.push(screencap_path, target_path)
-        self.adb.shell('chmod 777 %s' % target_path)
+        target_path = '/system/bin/screenshot'
         self.adb.shell('%s %s' % (target_path, os.path.join(resultsdir, 'screencap.png')))
 
     def _copyorgoutputfile(self, resultsdir):

=== modified file 'tests/test_swprofile.py'
--- tests/test_swprofile.py	2011-12-08 11:14:20 +0000
+++ tests/test_swprofile.py	2011-12-30 08:23:23 +0000
@@ -18,13 +18,13 @@
 import lava_android_test.swprofile
 from tests.tests_util import fake_adb, clear_fake
 
-package_list_info = '''android:4.0.1.2.3.4.5.6.7.8.9-3 (#14)
-com.android.musicvis:4.0.1.2.3.4.5.6.7.8.9-3 (#14)
-com.android.videoeditor:1.1 (#11)
-com.android.vpndialogs:4.0.1.2.3.4.5.6.7.8.9-3 (#14)
-com.android.wallpaper:4.0.1.2.3.4.5.6.7.8.9-3 (#14)
-com.android.wallpaper.livepicker:4.0.1.2.3.4.5.6.7.8.9-3 (#14)
-com.svox.pico:1.0 (#1)'''
+package_list_info = '''package:android:4.0.1.2.3.4.5.6.7.8.9-3 (#14)
+package:com.android.musicvis:4.0.1.2.3.4.5.6.7.8.9-3 (#14)
+package:com.android.videoeditor:1.1 (#11)
+package:com.android.vpndialogs:4.0.1.2.3.4.5.6.7.8.9-3 (#14)
+package:com.android.wallpaper:4.0.1.2.3.4.5.6.7.8.9-3 (#14)
+package:com.android.wallpaper.livepicker:4.0.1.2.3.4.5.6.7.8.9-3 (#14)
+package:com.svox.pico:1.0 (#1)'''
 
 getprop_info = '''[dalvik.vm.heapsize]: [24m]
 [dalvik.vm.stack-trace-file]: [/data/anr/traces.txt]