Fix commandline and disabling tests for apk based tests.

build/android/test_package_apk.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 import os
 import sys
 
 import cmd_helper
 import logging
@@ skipping 10 matching lines @@
     device: Device to run the tests.
     test_suite: A specific test suite to run, empty to run all.
     timeout: Timeout for each test.
     rebaseline: Whether or not to run tests in isolation and update the filter.
     performance_test: Whether or not performance test(s).
     cleanup_test_files: Whether or not to cleanup test files on device.
     tool: Name of the Valgrind tool.
     dump_debug_info: A debug_info object.
   """
 
-  APK_DATA_DIR = '/data/user/0/com.android.chrome.native_tests/files/'
+  APK_DATA_DIR = '/data/user/0/org.chromium.native_test/files/'

[John Grabowski, 2012/04/24 22:15:00]

Ha!

 
   def __init__(self, adb, device, test_suite, timeout, rebaseline,
                performance_test, cleanup_test_files, tool,
                dump_debug_info):
     TestPackage.__init__(self, adb, device, test_suite, timeout,
                          rebaseline, performance_test, cleanup_test_files,
                          tool, dump_debug_info)
 
   def _CreateTestRunnerScript(self, options):
     tool_wrapper = self.tool.GetTestWrapper()
@@ skipping 39 matching lines @@
   def StripAndCopyExecutable(self):
     # Always uninstall the previous one (by activity name); we don't
     # know what was embedded in it.
     logging.info('Uninstalling any activity with the test name')
     self.adb.Adb().SendCommand('uninstall org.chromium.native_test',
                                timeout_time=60*5)
     logging.info('Installing new apk')
     self.adb.Adb().SendCommand('install -r ' + self.test_suite_full,
                                timeout_time=60*5)
     logging.info('Install has completed.')