Android: Refactor native test setup in a util class.

Android: Refactor native test setup in a util class.

This is also needed by content_browsertests.
Also redirecting stdout,stderr for content_browsertests to a fifo file to be read by the test runner scripts.
BUG=138275
TBR=jam@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=181587

[nilesh, 2013-02-06 05:57:33]

Please take a look.

[nyquist, 2013-02-06 18:11:23]

lgtm

[nilesh, 2013-02-06 18:36:41]

Yaron: Owners stamp for content/shell/android .

[nilesh, 2013-02-06 18:38:29]

On 2013/02/06 18:36:41, nileshagrawal1 wrote:
> Yaron: Owners stamp for content/shell/android .

TBRing jam for content/content_tests.gypi as it is a trivial change.

[Yaron, 2013-02-06 19:10:06]

https://codereview.chromium.org/12213035/diff/2001/testing/android/native_tes...
File testing/android/native_test_util.h (right):

https://codereview.chromium.org/12213035/diff/2001/testing/android/native_tes...
testing/android/native_test_util.h:18: class NativeTestUtil {
Per style guide, I believe this should just be a namespace

https://codereview.chromium.org/12213035/diff/2001/testing/android/native_tes...
testing/android/native_test_util.h:20: NativeTestUtil();
At a minimum, you could make the constructor private.

[nilesh, 2013-02-06 19:31:19]

PTAL.

https://codereview.chromium.org/12213035/diff/2001/testing/android/native_tes...
File testing/android/native_test_util.h (right):

https://codereview.chromium.org/12213035/diff/2001/testing/android/native_tes...
testing/android/native_test_util.h:18: class NativeTestUtil {
On 2013/02/06 19:10:07, Yaron wrote:
> Per style guide, I believe this should just be a namespace

Done.

[Yaron, 2013-02-06 19:45:40]

lgtm

Update description to mention fifo change

[nilesh, 2013-02-06 21:34:10]

On 2013/02/06 19:45:40, Yaron wrote:
> lgtm
> 
> Update description to mention fifo change

Done

[commit-bot: I haz the power, 2013-02-06 22:13:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nileshagrawal@chromium.org/12213035/9

[commit-bot: I haz the power, 2013-02-07 02:53:18]

Retried try job too often on linux_chromeos for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-02-07 04:44:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nileshagrawal@chromium.org/12213035/9

[commit-bot: I haz the power, 2013-02-07 04:44:47]

Failed to apply patch for
content/shell/android/browsertests_apk/content_browser_tests_android.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
content/shell/android/browsertests_apk/content_browser_tests_android.cc
  Hunk #1 FAILED at 22.
  1 out of 3 hunks FAILED -- saving rejects to file
content/shell/android/browsertests_apk/content_browser_tests_android.cc.rej

Patch:      
content/shell/android/browsertests_apk/content_browser_tests_android.cc
Index: content/shell/android/browsertests_apk/content_browser_tests_android.cc
diff --git
a/content/shell/android/browsertests_apk/content_browser_tests_android.cc
b/content/shell/android/browsertests_apk/content_browser_tests_android.cc
index
83f24f6d5f483032950229329d4832ebd3525d9d..48b73e9fc2e971cdbc02f241d2d95a1b24eda8b2
100644
--- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc
+++ b/content/shell/android/browsertests_apk/content_browser_tests_android.cc
@@ -22,60 +22,23 @@
 #include "content/public/app/android_library_loader_hooks.h"
 #include "content/shell/android/shell_jni_registrar.h"
 #include "jni/ContentBrowserTestsActivity_jni.h"
+#include "testing/android/native_test_util.h"
+
+using testing::native_test_util::ArgsToArgv;
+using testing::native_test_util::CreateFIFO;
+using testing::native_test_util::ParseArgsFromCommandLineFile;
+using testing::native_test_util::RedirectStream;
+using testing::native_test_util::ScopedMainEntryLogger;
 
 // The main function of the program to be wrapped as an apk.
 extern int main(int argc, char** argv);
 
 namespace {
 
-void ParseArgsFromString(const std::string& command_line,
-                         std::vector<std::string>* args) {
-  base::StringTokenizer tokenizer(command_line, kWhitespaceASCII);
-  tokenizer.set_quote_chars("\"");
-  while (tokenizer.GetNext()) {
-    std::string token;
-    RemoveChars(tokenizer.token(), "\"", &token);
-    args->push_back(token);
-  }
-}
-
-void ParseArgsFromCommandLineFile(std::vector<std::string>* args) {
-  // The test runner script writes the command line file in
-  // "/data/local/tmp".
-  static const char kCommandLineFilePath[] =
-      "/data/local/tmp/content-browser-tests-command-line";
-  FilePath command_line(kCommandLineFilePath);
-  std::string command_line_string;
-  if (file_util::ReadFileToString(command_line, &command_line_string)) {
-    ParseArgsFromString(command_line_string, args);
-  }
-}
-
-int ArgsToArgv(const std::vector<std::string>& args,
-                std::vector<char*>* argv) {
-  // We need to pass in a non-const char**.
-  int argc = args.size();
-
-  argv->resize(argc + 1);
-  for (int i = 0; i < argc; ++i)
-    (*argv)[i] = const_cast<char*>(args[i].c_str());
-  (*argv)[argc] = NULL;  // argv must be NULL terminated.
-
-  return argc;
-}
-
-class ScopedMainEntryLogger {
- public:
-  ScopedMainEntryLogger() {
-    printf(">>ScopedMainEntryLogger\n");
-  }
-
-  ~ScopedMainEntryLogger() {
-    printf("<<ScopedMainEntryLogger\n");
-    fflush(stdout);
-    fflush(stderr);
-  }
-};
+// The test runner script writes the command line file in
+// "/data/local/tmp".
+static const char kCommandLineFilePath[] =
+    "/data/local/tmp/content-browser-tests-command-line";
 
 }  // namespace
 
@@ -95,9 +58,8 @@ static void RunTests(JNIEnv* env,
   base::android::RegisterJni(env);
 
   std::vector<std::string> args;
-  ParseArgsFromCommandLineFile(&args);
+  ParseArgsFromCommandLineFile(kCommandLineFilePath, &args);
 
-  // We need to pass in a non-const char**.
   std::vector<char*> argv;
   int argc = ArgsToArgv(args, &argv);
 
@@ -105,6 +67,13 @@ static void RunTests(JNIEnv* env,
   CommandLine::ForCurrentProcess()->AppendArguments(
       CommandLine(argc, &argv[0]), false);
 
+  // Create fifo and redirect stdout and stderr to it.
+  FilePath files_dir(base::android::ConvertJavaStringToUTF8(env, jfiles_dir));
+  FilePath fifo_path(files_dir.Append(FilePath("test.fifo")));
+  CreateFIFO(fifo_path.value().c_str());
+  RedirectStream(stdout, fifo_path.value().c_str(), "w");
+  dup2(STDOUT_FILENO, STDERR_FILENO);
+
   ScopedMainEntryLogger scoped_main_entry_logger;
   main(argc, &argv[0]);
 }

[commit-bot: I haz the power, 2013-02-09 00:32:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nileshagrawal@chromium.org/12213035/10006

[commit-bot: I haz the power, 2013-02-09 02:45:33]

Change committed as 181587