This is a simple integration test that loads a simple nexe and verifies that Javascript can communicate with it. The required html, javascript and nexe files are checked in into the NaCl tree.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=28796
Review URL: http://codereview.chromium.org/272005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28855 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 72 insertions, 0 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 4387938..4249a29 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -4088,6 +4088,66 @@
       ],
     },
     {
+      'target_name': 'nacl_ui_tests',
+      'type': 'executable',
+      'msvs_guid': '43E2004F-CD62-4595-A8A6-31E9BFA1EE5E',
+      'dependencies': [
+        'chrome',
+        'browser',
+        'debugger',
+        'common',
+        'chrome_resources',
+        'chrome_strings',
+        'syncapi',
+        'test_support_ui',
+        '../base/base.gyp:base',
+        '../net/net.gyp:net',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
+        '../skia/skia.gyp:skia',
+        '../testing/gtest.gyp:gtest',
+        '../third_party/icu/icu.gyp:icui18n',
+        '../third_party/icu/icu.gyp:icuuc',
+        '../third_party/libxml/libxml.gyp:libxml',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'test/nacl/nacl_test.cc',
+      ],
+      'conditions': [
+        # TODO(gregoryd): This test will run on Windows only at first.
+        # Refer to ui_tests target above if any problems appear when trying
+        # to enable it on other platforms.
+        ['OS=="win"', {
+          'dependencies': [
+            'crash_service',  # run time dependency
+            'security_tests',  # run time dependency
+            'test_support_common',
+            '../google_update/google_update.gyp:google_update',
+            '../views/views.gyp:views',
+            # run time dependency
+            '../webkit/tools/test_shell/test_shell.gyp:npapi_test_plugin',
+            '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lOleAcc.lib',
+            ],
+          },
+          'configurations': {
+            'Debug': {
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
+                },
+              },
+            },
+          },
+        }],
+      ],
+    },
+    {
       'target_name': 'unit_tests',
       'type': 'executable',
       'msvs_guid': 'ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC',
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 10f8b58..e028d14c 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -307,6 +307,11 @@ static void RunCommand(const CommandLine& cmd_line) {
 }
 
 void UITest::StartHttpServer(const FilePath& root_directory) {
+  StartHttpServerWithPort(root_directory, L"");
+}
+
+void UITest::StartHttpServerWithPort(const FilePath& root_directory,
+                                     const std::wstring& port) {
   scoped_ptr<CommandLine> cmd_line(CreateHttpServerCommandLine());
   ASSERT_TRUE(cmd_line.get());
   cmd_line->AppendSwitchWithValue("server", "start");
@@ -321,6 +326,9 @@ void UITest::StartHttpServer(const FilePath& root_directory) {
     cmd_line->AppendSwitch("run_background");
 #endif
 
+  if (!port.empty()) {
+     cmd_line->AppendSwitchWithValue("port", port);
+  }
   RunCommand(*cmd_line.get());
 }
 
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 2ed3cf4..165d9e5 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -446,6 +446,10 @@ class UITest : public testing::Test {
 
   // Synchronously launches local http server normally used to run LayoutTests.
   void StartHttpServer(const FilePath& root_directory);
+
+  // Launches local http server on the specified port.
+  void StartHttpServerWithPort(const FilePath& root_directory,
+                               const std::wstring& port);
   void StopHttpServer();
 
  private: