diff options
| author | mbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-29 22:44:42 +0000 |
|---|---|---|
| committer | mbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-29 22:44:42 +0000 |
| commit | 99988105f063381b0bc5736f0d591c97ae76a46b (patch) | |
| tree | 12b4668d73df8985783bfab2f998e276d2ffdcf8 /chrome | |
| parent | ff7560d747b007c4c7921333e9ec4c780ad31cf3 (diff) | |
| download | chromium_src-99988105f063381b0bc5736f0d591c97ae76a46b.zip chromium_src-99988105f063381b0bc5736f0d591c97ae76a46b.tar.gz chromium_src-99988105f063381b0bc5736f0d591c97ae76a46b.tar.bz2 | |
Make the user data directory configurable from the cmdline
for the memory tests.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/memory_test/memory_test.cc | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc index 99b5179..b38ad0a 100644 --- a/chrome/test/memory_test/memory_test.cc +++ b/chrome/test/memory_test/memory_test.cc @@ -38,13 +38,18 @@ class MemoryTest : public UITest { CommandLine::AppendSwitch(&launch_arguments_, switches::kPlaybackMode);
CommandLine::AppendSwitch(&launch_arguments_, switches::kNoEvents);
- // Compute the user-data-dir which contains our test cache.
- PathService::Get(base::DIR_EXE, &user_data_dir_);
- file_util::UpOneDirectory(&user_data_dir_);
- file_util::UpOneDirectory(&user_data_dir_);
- file_util::AppendToPath(&user_data_dir_, L"data");
- file_util::AppendToPath(&user_data_dir_, L"memory_test");
- file_util::AppendToPath(&user_data_dir_, L"general_mix");
+ // Get the specified user data dir (optional)
+ user_data_dir_ = CommandLine().GetSwitchValue(switches::kUserDataDir);
+
+ if (user_data_dir_.length() == 0) {
+ // Compute the user-data-dir which contains our test cache.
+ PathService::Get(base::DIR_EXE, &user_data_dir_);
+ file_util::UpOneDirectory(&user_data_dir_);
+ file_util::UpOneDirectory(&user_data_dir_);
+ file_util::AppendToPath(&user_data_dir_, L"data");
+ file_util::AppendToPath(&user_data_dir_, L"memory_test");
+ file_util::AppendToPath(&user_data_dir_, L"general_mix");
+ }
CommandLine::AppendSwitchWithValue(&launch_arguments_,
switches::kUserDataDir,
user_data_dir_);
|