Index: chrome/test/nacl/nacl_browsertest_util.cc |
diff --git a/chrome/test/nacl/nacl_browsertest_util.cc b/chrome/test/nacl/nacl_browsertest_util.cc |
index b4f4ee8613172a377dcb761a3597447c82c45b55..348058a7081eee9d38ca713a870986f1cd896885 100644 |
--- a/chrome/test/nacl/nacl_browsertest_util.cc |
+++ b/chrome/test/nacl/nacl_browsertest_util.cc |
@@ -5,6 +5,7 @@ |
#include "chrome/test/nacl/nacl_browsertest_util.h" |
#include "base/command_line.h" |
+#include "base/environment.h" |
#include "base/json/json_reader.h" |
#include "base/path_service.h" |
#include "base/values.h" |
@@ -182,6 +183,14 @@ NaClBrowserTestBase::NaClBrowserTestBase() { |
NaClBrowserTestBase::~NaClBrowserTestBase() { |
} |
+void NaClBrowserTestBase::SetUp() { |
+#if defined(ADDRESS_SANITIZER) |
+ base::Environment* env = base::Environment::Create(); |
+ env->SetVar("NACL_DANGEROUS_SKIP_QUALIFICATION_TEST", "1"); |
Mark Seaborn
2013/01/29 17:37:26
Shouldn't you also unset this env var for the next
|
+#endif |
+ InProcessBrowserTest::SetUp(); |
+} |
+ |
void NaClBrowserTestBase::SetUpCommandLine(CommandLine* command_line) { |
command_line->AppendSwitch(switches::kNoFirstRun); |
command_line->AppendSwitch(switches::kEnableNaCl); |