summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authornileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-25 01:50:21 +0000
committernileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-25 01:50:21 +0000
commit3ffb5e43d0996501ea2a3923c2e8c73dcf1d9b66 (patch)
treec2dcbf7b9333337c21ca5767507785cf83c119b1 /testing
parentf6267c4f1b9ac28985fa994562ff70b4ce4c96d8 (diff)
downloadchromium_src-3ffb5e43d0996501ea2a3923c2e8c73dcf1d9b66.zip
chromium_src-3ffb5e43d0996501ea2a3923c2e8c73dcf1d9b66.tar.gz
chromium_src-3ffb5e43d0996501ea2a3923c2e8c73dcf1d9b66.tar.bz2
Fix commandline and disabling tests for apk based tests.
Command for running with a test filter: ./build/android/run_tests.py -s out/Release/base_unittests_apk/base_unittests-debug.apk -f FileUtilTest.* The _disabled file should be base_unittests-debug_disabled BUG= TEST= Review URL: http://codereview.chromium.org/10214002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
-rw-r--r--testing/android/native_test_apk.xml2
-rw-r--r--testing/android/native_test_launcher.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/testing/android/native_test_apk.xml b/testing/android/native_test_apk.xml
index bae45ce..41838d2 100644
--- a/testing/android/native_test_apk.xml
+++ b/testing/android/native_test_apk.xml
@@ -5,7 +5,7 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
-<project name="ChromeNativeTests" default="debug" basedir=".">
+<project name="replaceme" default="debug" basedir=".">
<description>
Building native test runner ChromeNativeTests_replaceme.apk
diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc
index bc5d47f..455d43d 100644
--- a/testing/android/native_test_launcher.cc
+++ b/testing/android/native_test_launcher.cc
@@ -128,7 +128,7 @@ void LibraryLoadedOnMainThread(JNIEnv* env) {
// internal gtest data structures based on the command line.
// It needs to be scoped as it also resets the CommandLine.
std::vector<std::string> args;
- FilePath path("/data/user/0/org.chromium.native_tests/files/");
+ FilePath path("/data/user/0/org.chromium.native_test/files/");
ParseArgsFromCommandLineFile(path, &args);
std::vector<char*> argv;
ArgsToArgv(args, &argv);