summaryrefslogtreecommitdiffstats
path: root/chrome/installer/setup
diff options
context:
space:
mode:
authorgrt <grt@chromium.org>2015-07-06 12:36:43 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-06 19:38:46 +0000
commit734e87b2ebe7ad248545616885a6e48d439084d3 (patch)
treeb0295dcbd9610e130206ccbc70227006a26c6bc2 /chrome/installer/setup
parentc7a4cf4382ded31385f8430fd5c664abca480214 (diff)
downloadchromium_src-734e87b2ebe7ad248545616885a6e48d439084d3.zip
chromium_src-734e87b2ebe7ad248545616885a6e48d439084d3.tar.gz
chromium_src-734e87b2ebe7ad248545616885a6e48d439084d3.tar.bz2
GN support for setup_unittests.
BUG=470212 R=brettw@chromium.org Review URL: https://codereview.chromium.org/1212163010 Cr-Commit-Position: refs/heads/master@{#337443}
Diffstat (limited to 'chrome/installer/setup')
-rw-r--r--chrome/installer/setup/BUILD.gn57
-rw-r--r--chrome/installer/setup/setup_unittests.rc69
-rw-r--r--chrome/installer/setup/setup_unittests_resource.h18
3 files changed, 57 insertions, 87 deletions
diff --git a/chrome/installer/setup/BUILD.gn b/chrome/installer/setup/BUILD.gn
new file mode 100644
index 0000000..449f16f
--- /dev/null
+++ b/chrome/installer/setup/BUILD.gn
@@ -0,0 +1,57 @@
+# Copyright 2015 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.
+
+import("//testing/test.gni")
+
+if (is_win) {
+ test("setup_unittests") {
+ # TODO(robertshield): Move the items marked with "Move to lib"
+ # below into a separate lib and then link both setup.exe and
+ # setup_unittests.exe against that.
+ sources = [
+ "../mini_installer/appid.h",
+ "../mini_installer/chrome.release", # Move to lib
+ "../mini_installer/chrome_appid.cc",
+ "../mini_installer/configuration.cc",
+ "../mini_installer/configuration.h",
+ "../mini_installer/configuration_test.cc",
+ "../mini_installer/decompress.cc",
+ "../mini_installer/decompress.h",
+ "../mini_installer/decompress_test.cc",
+ "../mini_installer/mini_string.cc",
+ "../mini_installer/mini_string.h",
+ "../mini_installer/mini_string_test.cc",
+ "app_launcher_installer.cc", # Move to lib
+ "app_launcher_installer.h", # Move to lib
+ "archive_patch_helper.cc", # Move to lib
+ "archive_patch_helper.h", # Move to lib
+ "archive_patch_helper_unittest.cc",
+ "install.cc", # Move to lib
+ "install.h", # Move to lib
+ "install_unittest.cc",
+ "install_worker.cc", # Move to lib
+ "install_worker.h", # Move to lib
+ "install_worker_unittest.cc",
+ "run_all_unittests.cc",
+ "setup_constants.cc", # Move to lib
+ "setup_constants.h", # Move to lib
+ "setup_util.cc",
+ "setup_util_unittest.cc",
+ "setup_util_unittest.h",
+ ]
+
+ deps = [
+ "//base",
+ "//base:i18n",
+ "//base/test:test_support",
+ "//chrome/installer/util:strings",
+ "//chrome/installer/util:util",
+ "//testing/gmock",
+ "//testing/gtest",
+ ]
+
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+ }
+}
diff --git a/chrome/installer/setup/setup_unittests.rc b/chrome/installer/setup/setup_unittests.rc
deleted file mode 100644
index 4fd7dd5..0000000
--- a/chrome/installer/setup/setup_unittests.rc
+++ /dev/null
@@ -1,69 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "setup_unittests_resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE 9, 1
-#pragma code_page(1252)
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "setup_unittests_resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
- "#include ""windows.h""\r\n"
- "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-#include "chrome/installer/util/installer_util_strings.rc"
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
diff --git a/chrome/installer/setup/setup_unittests_resource.h b/chrome/installer/setup/setup_unittests_resource.h
deleted file mode 100644
index 6b3a0ee..0000000
--- a/chrome/installer/setup/setup_unittests_resource.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2011 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.
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by setup_unittests.rc
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1001
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif