diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 20:29:17 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 20:29:17 +0000 |
| commit | d6b4f43e5ba0048e2d72c2801c694135d32fa7e4 (patch) | |
| tree | 049adc435c74c0400eae67f22e6e01979e6fcde7 /chrome/test/ui | |
| parent | c9af00d21e67b4dee15ec54655d30cb9f9139972 (diff) | |
| download | chromium_src-d6b4f43e5ba0048e2d72c2801c694135d32fa7e4.zip chromium_src-d6b4f43e5ba0048e2d72c2801c694135d32fa7e4.tar.gz chromium_src-d6b4f43e5ba0048e2d72c2801c694135d32fa7e4.tar.bz2 | |
Fix CheckFalseTest.CheckFails on Linux after my change to ui_test.
This makes PathService clear its cache after overriding a path.
We have many paths depending on each other, so this is necessary
to avoid inconsistencies.
TEST=ui_tests in Release mode
BUG=49838
Review URL: http://codereview.chromium.org/2805100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index b321ebf..2ca1690 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -15,6 +15,7 @@ #include "app/sql/connection.h" #include "base/base_switches.h" #include "base/command_line.h" +#include "base/environment.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" @@ -385,6 +386,17 @@ void UITestBase::LaunchBrowser(const CommandLine& arguments, // side. Using PathService seems to be the most reliable, consistent way // to do that. ASSERT_TRUE(PathService::Override(chrome::DIR_USER_DATA, user_data_dir())); + +#if defined(OS_LINUX) + // Make sure the cache directory is inside our clear profile. Otherwise + // the cache may contain data from earlier tests that could break the + // current test. + // + // Note: we use an environment variable here, because we have to pass the + // value to the child process. This is the simplest way to do it. + scoped_ptr<base::Environment> env(base::Environment::Create()); + env->SetVar("XDG_CACHE_HOME", user_data_dir().value()); +#endif } if (!template_user_data_.empty()) { |