summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
Diffstat (limited to 'testing')
-rw-r--r--testing/android/native_test.gyp12
-rw-r--r--testing/android/native_test_launcher.cc102
-rw-r--r--testing/android/native_test_util.cc90
-rw-r--r--testing/android/native_test_util.h41
4 files changed, 159 insertions, 86 deletions
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index 06f7279..ebf0b42 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -69,6 +69,7 @@
'../../base/base.gyp:test_support_base',
'../gtest.gyp:gtest',
'native_test_jni_headers',
+ 'native_test_util',
],
},
{
@@ -89,6 +90,17 @@
],
},
},
+ {
+ 'target_name': 'native_test_util',
+ 'type': 'static_library',
+ 'sources': [
+ 'native_test_util.cc',
+ 'native_test_util.h',
+ ],
+ 'dependencies': [
+ '../../base/base.gyp:base',
+ ],
+ },
],
}]
],
diff --git a/testing/android/native_test_launcher.cc b/testing/android/native_test_launcher.cc
index e3cf59e..68bb5d1 100644
--- a/testing/android/native_test_launcher.cc
+++ b/testing/android/native_test_launcher.cc
@@ -11,27 +11,27 @@
#include <android/log.h>
#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
#include "base/android/base_jni_registrar.h"
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
-#include "base/android/locale_utils.h"
-#include "base/android/path_utils.h"
#include "base/android/scoped_java_ref.h"
#include "base/at_exit.h"
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/file_path.h"
-#include "base/file_util.h"
#include "base/logging.h"
-#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "base/strings/string_tokenizer.h"
#include "gtest/gtest.h"
+#include "testing/android/native_test_util.h"
#include "testing/jni/ChromeNativeTestActivity_jni.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 a test apk.
extern int main(int argc, char** argv);
@@ -42,16 +42,14 @@ namespace {
const char kSeparateStderrFifo[] = "separate-stderr-fifo";
const char kCreateStdinFifo[] = "create-stdin-fifo";
+// The test runner script writes the command line file in
+// "/data/local/tmp".
+static const char kCommandLineFilePath[] =
+ "/data/local/tmp/chrome-native-tests-command-line";
+
const char kLogTag[] = "chromium";
const char kCrashedMarker[] = "[ CRASHED ]\n";
-void AndroidLogError(const char* format, ...) {
- va_list args;
- va_start(args, format);
- __android_log_vprint(ANDROID_LOG_ERROR, kLogTag, format, args);
- va_end(args);
-}
-
// The list of signals which are considered to be crashes.
const int kExceptionSignals[] = {
SIGSEGV, SIGABRT, SIGFPE, SIGILL, SIGBUS, -1
@@ -80,73 +78,6 @@ void InstallHandlers() {
}
}
-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/chrome-native-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;
-}
-
-void CreateFIFO(const char* fifo_path) {
- unlink(fifo_path);
- // Default permissions for mkfifo is ignored, chmod is required.
- if (mkfifo(fifo_path, 0666) || chmod(fifo_path, 0666)) {
- AndroidLogError("Failed to create fifo %s: %s\n",
- fifo_path, strerror(errno));
- exit(EXIT_FAILURE);
- }
-}
-
-void Redirect(FILE* stream, const char* path, const char* mode) {
- if (!freopen(path, mode, stream)) {
- AndroidLogError("Failed to redirect stream to file: %s: %s\n",
- path, strerror(errno));
- exit(EXIT_FAILURE);
- }
-}
-
-class ScopedMainEntryLogger {
- public:
- ScopedMainEntryLogger() {
- printf(">>ScopedMainEntryLogger\n");
- }
-
- ~ScopedMainEntryLogger() {
- printf("<<ScopedMainEntryLogger\n");
- fflush(stdout);
- fflush(stderr);
- }
-};
-
} // namespace
// This method is called on a separate java thread so that we won't trigger
@@ -168,9 +99,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);
@@ -202,11 +132,11 @@ static void RunTests(JNIEnv* env,
}
// Only redirect the streams after all fifos have been created.
- Redirect(stdout, fifo_path.value().c_str(), "w");
+ RedirectStream(stdout, fifo_path.value().c_str(), "w");
if (!stdin_fifo_path.empty())
- Redirect(stdin, stdin_fifo_path.value().c_str(), "r");
+ RedirectStream(stdin, stdin_fifo_path.value().c_str(), "r");
if (!stderr_fifo_path.empty())
- Redirect(stderr, stderr_fifo_path.value().c_str(), "w");
+ RedirectStream(stderr, stderr_fifo_path.value().c_str(), "w");
else
dup2(STDOUT_FILENO, STDERR_FILENO);
diff --git a/testing/android/native_test_util.cc b/testing/android/native_test_util.cc
new file mode 100644
index 0000000..08f901b
--- /dev/null
+++ b/testing/android/native_test_util.cc
@@ -0,0 +1,90 @@
+// Copyright (c) 2013 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.
+
+#include "testing/android/native_test_util.h"
+
+#include <android/log.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "base/command_line.h"
+#include "base/file_path.h"
+#include "base/file_util.h"
+#include "base/string_util.h"
+#include "base/strings/string_tokenizer.h"
+
+namespace {
+
+const char kLogTag[] = "chromium";
+
+void AndroidLogError(const char* format, ...) {
+ va_list args;
+ va_start(args, format);
+ __android_log_vprint(ANDROID_LOG_ERROR, kLogTag, format, args);
+ va_end(args);
+}
+
+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);
+ }
+}
+
+} // namespace
+
+namespace testing {
+namespace native_test_util {
+
+void CreateFIFO(const char* fifo_path) {
+ unlink(fifo_path);
+ // Default permissions for mkfifo is ignored, chmod is required.
+ if (mkfifo(fifo_path, 0666) || chmod(fifo_path, 0666)) {
+ AndroidLogError("Failed to create fifo %s: %s\n",
+ fifo_path, strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+}
+
+void RedirectStream(
+ FILE* stream, const char* path, const char* mode) {
+ if (!freopen(path, mode, stream)) {
+ AndroidLogError("Failed to redirect stream to file: %s: %s\n",
+ path, strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+}
+
+void ParseArgsFromCommandLineFile(
+ const char* path, std::vector<std::string>* args) {
+ base::FilePath command_line(path);
+ 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;
+}
+
+} // namespace native_test_util
+} // namespace testing
diff --git a/testing/android/native_test_util.h b/testing/android/native_test_util.h
new file mode 100644
index 0000000..4e40222
--- /dev/null
+++ b/testing/android/native_test_util.h
@@ -0,0 +1,41 @@
+// Copyright (c) 2013 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.
+
+#ifndef TESTING_ANDROID_NATIVE_TEST_UTIL_
+#define TESTING_ANDROID_NATIVE_TEST_UTIL_
+
+#include <stdio.h>
+#include <string>
+#include <vector>
+
+// Helper methods for setting up environment for running gtest tests
+// inside an APK.
+namespace testing {
+namespace native_test_util {
+
+class ScopedMainEntryLogger {
+ public:
+ ScopedMainEntryLogger() {
+ printf(">>ScopedMainEntryLogger\n");
+ }
+
+ ~ScopedMainEntryLogger() {
+ printf("<<ScopedMainEntryLogger\n");
+ fflush(stdout);
+ fflush(stderr);
+ }
+};
+
+// Creates a fifo at the given |fifo_path|.
+void CreateFIFO(const char* fifo_path);
+// Redirects the |stream| to the file provided by |path|.
+void RedirectStream(FILE* stream, const char* path, const char* mode);
+void ParseArgsFromCommandLineFile(
+ const char* path, std::vector<std::string>* args);
+int ArgsToArgv(const std::vector<std::string>& args, std::vector<char*>* argv);
+
+} // namespace native_test_util
+} // namespace testing
+
+#endif // TESTING_ANDROID_NATIVE_TEST_UTIL_
generated by cgit v1.1 at 2025-01-16 17:11:53 +0000