Add nacl-gdb-script switch.

chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc

 // 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.
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 12 matching lines @@
   }
 
   void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     PPAPINaClTest::SetUpCommandLine(command_line);
 
     FilePath mock_nacl_gdb;
     EXPECT_TRUE(PathService::Get(base::DIR_EXE, &mock_nacl_gdb));
     mock_nacl_gdb = mock_nacl_gdb.Append(kMockNaClGdb);
     command_line->AppendSwitchPath(switches::kNaClGdb, mock_nacl_gdb);
   }
+
+  void RunWithNaClGdb(std::string test_name) {
+    FilePath mock_nacl_gdb_file;
+    scoped_ptr<base::Environment> env(base::Environment::Create());
+    std::string content;
+    // TODO(halyavin): Make this test to work on Windows 32-bit. Currently this

[Mark Seaborn, 2012/05/24 17:25:58]

"Make this test work"

[halyavin, 2012/05/25 09:37:45]

Done.

+    // is not possible because NaCl doesn't work without sandbox since 1Gb of
+    // space is not reserved. We can't reserve 1Gb of space because
+    // base::LaunchProcess doesn't support creating suspended processes. We need
+    // to either add suspended process support to base::LaunchProcess or use
+    // Win API.
+#if defined(OS_WIN)
+    if (base::win::OSInfo::GetInstance()->wow64_status() ==
+      base::win::OSInfo::WOW64_DISABLED) {
+        return;
+    }
+#endif
+    EXPECT_TRUE(file_util::CreateTemporaryFile(&mock_nacl_gdb_file));
+    env->SetVar("MOCK_NACL_GDB", mock_nacl_gdb_file.AsUTF8Unsafe());
+    RunTestViaHTTP(test_name);
+    env->UnSetVar("MOCK_NACL_GDB");
+    EXPECT_TRUE(file_util::ReadFileToString(mock_nacl_gdb_file, &content));
+    EXPECT_STREQ("PASS", content.c_str());
+    EXPECT_TRUE(file_util::Delete(mock_nacl_gdb_file, false));
+  }
 };
 
 // Fails on the ASAN test bot. See http://crbug.com/122219
 #if defined(ADDRESS_SANITIZER)
 #define MAYBE_Empty DISABLED_Empty
 #else
 #define MAYBE_Empty Empty
 #endif
 IN_PROC_BROWSER_TEST_F(NaClGdbTest, MAYBE_Empty) {
-  FilePath mock_nacl_gdb_file;
-  scoped_ptr<base::Environment> env(base::Environment::Create());
-  std::string content;
-  // TODO(halyavin): Make this test to work on Windows 32-bit. Currently this
-  // is not possible because NaCl doesn't work without sandbox since 1Gb of
-  // space is not reserved. We can't reserve 1Gb of space because
-  // base::LaunchProcess doesn't support creating suspended processes. We need
-  // to either add suspended process support to base::LaunchProcess or use
-  // Win API.
-#if defined(OS_WIN)
-  if (base::win::OSInfo::GetInstance()->wow64_status() ==
-      base::win::OSInfo::WOW64_DISABLED) {
-    return;
+  RunWithNaClGdb("Empty");
+}
+
+class NaClGdbScriptTest : public NaClGdbTest {
+ public:
+  NaClGdbScriptTest() {
   }
-#endif
-  EXPECT_TRUE(file_util::CreateTemporaryFile(&mock_nacl_gdb_file));
-  env->SetVar("MOCK_NACL_GDB", mock_nacl_gdb_file.AsUTF8Unsafe());
-  RunTestViaHTTP("Empty");
-  env->UnSetVar("MOCK_NACL_GDB");
-  EXPECT_TRUE(file_util::ReadFileToString(mock_nacl_gdb_file, &content));
-  EXPECT_STREQ("PASS", content.c_str());
-  EXPECT_TRUE(file_util::Delete(mock_nacl_gdb_file, false));
+
+  void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    NaClGdbTest::SetUpCommandLine(command_line);
+    EXPECT_TRUE(file_util::CreateTemporaryFile(&script_));
+    command_line->AppendSwitchPath("nacl-gdb-script", script_);
+  }
+
+  void RunWithNaClGdb(std::string test_name) {
+    scoped_ptr<base::Environment> env(base::Environment::Create());
+    env->SetVar("NACL_GDB_SCRIPT", script_.AsUTF8Unsafe());
+    NaClGdbTest::RunWithNaClGdb("Empty");

[Mark Seaborn, 2012/05/24 17:25:58]

I don't like this use of inheritance.  It's kind of confusing and would make
extending this test further difficult.

Having a separate test case to cover the new arg seems unnecessary.  Maybe just
add the script arg test into the existing test case?

[halyavin, 2012/05/25 09:37:45]

It will make extending it easier. All tests could extend NaClGdbTest. But we can
always separate the main part of test later if we need more that 2 tests.

+    env->UnSetVar("NACL_GDB_SCRIPT");
+    EXPECT_TRUE(file_util::Delete(script_, false));
+  }
+ private:
+  FilePath script_;
+};
+
+IN_PROC_BROWSER_TEST_F(NaClGdbScriptTest, MAYBE_Empty) {
+  RunWithNaClGdb("Empty");
 }