summaryrefslogtreecommitdiffstats
path: root/chrome/installer/installer.gyp
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-09 00:29:17 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-09 00:29:17 +0000
commit2c921642bf98d54fa4bd272a06c3fb77d7280cf9 (patch)
tree715ebc90dda5ba61d187bbfd97c2c0b8b3c5eb55 /chrome/installer/installer.gyp
parent19aad64511d3fad539184abfe5af5ff6264e630c (diff)
downloadchromium_src-2c921642bf98d54fa4bd272a06c3fb77d7280cf9.zip
chromium_src-2c921642bf98d54fa4bd272a06c3fb77d7280cf9.tar.gz
chromium_src-2c921642bf98d54fa4bd272a06c3fb77d7280cf9.tar.bz2
Trying to re-land r17758 (http://codereview.chromium.org/118247) but with name installer_util_unittests instead of util_unittests.
BUG=12849 Review URL: http://codereview.chromium.org/119322 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/installer.gyp')
-rw-r--r--chrome/installer/installer.gyp26
1 files changed, 22 insertions, 4 deletions
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index 807fb47..170a054 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -238,10 +238,10 @@
],
},
{
- 'target_name': 'installer_unittests',
+ 'target_name': 'installer_util_unittests',
'type': 'executable',
'msvs_guid': '903F8C1E-537A-4C9E-97BE-075147CBE769',
- 'msvs_existing_vcproj': 'util/installer_unittests.vcproj',
+ 'msvs_existing_vcproj': 'util/installer_util_unittests.vcproj',
'dependencies': [
'installer_util',
'installer_util_strings',
@@ -261,8 +261,8 @@
'util/delete_tree_work_item_unittest.cc',
'util/google_chrome_distribution_unittest.cc',
'util/helper_unittest.cc',
- 'util/installer_unittests.rc',
- 'util/installer_unittests_resource.h',
+ 'util/installer_util_unittests.rc',
+ 'util/installer_util_unittests_resource.h',
'util/move_tree_work_item_unittest.cc',
'util/run_all_unittests.cc',
'util/set_reg_value_work_item_unittest.cc',
@@ -546,6 +546,24 @@
}],
],
},
+ {
+ 'target_name': 'setup_unittests',
+ 'type': 'executable',
+ 'msvs_guid': 'C0AE4E06-F023-460F-BC14-6302CEAC51F8',
+ 'dependencies': [
+ 'installer_util',
+ '../../base/base.gyp:base',
+ '../../testing/gtest.gyp:gtest',
+ ],
+ 'include_dirs': [
+ '../..',
+ ],
+ 'sources': [
+ 'setup/run_all_unittests.cc',
+ 'setup/setup_util.cc',
+ 'setup/setup_util_unittest.cc',
+ ],
+ },
],
}],
[ 'branding == "Chrome"', {