Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Adding a unittest to verify that the code signing job will be able to…

… unpack and re-assemble the Chromoting host installation.

Review URL: http://codereview.chromium.org/10352018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135217 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information...
commit f45864ca0c232b05cc7d09ef678eb2be8f857056 1 parent 87a3a87
alexeypa@chromium.org authored
Showing with 80 additions and 0 deletions.
  1. +1 −0  .gitignore
  2. +1 −0  build/all.gyp
  3. +78 −0 remoting/remoting.gyp
View
1  .gitignore
@@ -119,6 +119,7 @@ v8.log
/remoting/proto/chromotocol_proto_lib.xml
/remoting/proto/trace_proto_lib.xml
/remoting/remoting_host_installation.xml
+/remoting/remoting_host_installation_unittest.xml
/remoting/remoting_me2me_host.xml
/remoting/remoting_version_resources.xml
/remoting/tools/internal/
View
1  build/all.gyp
@@ -548,6 +548,7 @@
platformsdk_exists == "True"', {
'dependencies': [
'../remoting/remoting.gyp:remoting_host_installation',
+ '../remoting/remoting.gyp:remoting_host_installation_unittest',
],
}], # component != "shared_library"
]
View
78 remoting/remoting.gyp
@@ -655,6 +655,7 @@
'-ext "<(wix_path)\\WixUIExtension.dll"',
'-ext "<(wix_path)\\WixUtilExtension.dll"',
'-cultures:en-us',
+ '-sw1076',
'-dVersion=<(version_full)',
'"-dFileSource=<(PRODUCT_DIR)."',
'"-dSasDllPath=<(platformsdk_path)/redist/x86/sas.dll"',
@@ -666,6 +667,83 @@
},
],
}, # end of target 'remoting_host_installation'
+
+ # The 'remoting_host_installation_unittest' target is used to make sure
+ # that the code signing job (running outside of Chromium tree) will be
+ # able to unpack and re-assemble the installation successfully.
+ #
+ # *** If this target fails to compile the code signing job will fail
+ # too, breaking the official build. ***
+ #
+ # N.B. The command lines passed to the WiX tools here should be in sync
+ # with the code signing script.
+ {
+ 'target_name': 'remoting_host_installation_unittest',
+ 'type': 'none',
+ 'dependencies': [
+ 'remoting_host_installation',
+ ],
+ 'sources': [
+ '<(PRODUCT_DIR)/chromoting.msi',
+ ],
+ 'outputs': [
+ '<(INTERMEDIATE_DIR)/chromoting-test.msi',
+ ],
+ 'rules': [
+ {
+ 'rule_name': 'dark',
+ 'extension': 'msi',
+ 'outputs': [
+ '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wxs',
+ ],
+ 'process_outputs_as_sources': 1,
+ 'msvs_cygwin_shell': 0,
+ 'msvs_quote_cmd': 0,
+ 'action': [
+ '"<(wix_path)\\dark"',
+ '"<(RULE_INPUT_PATH)"',
+ '-o <@(_outputs)',
+ '-o <@(_outputs)',
+ '-x <(INTERMEDIATE_DIR)',
+ ],
+ 'message': 'Dark: unpacking <(RULE_INPUT_PATH)',
+ },
+ {
+ 'rule_name': 'candle',
+ 'extension': 'wxs',
+ 'outputs': [
+ '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).wixobj',
+ ],
+ 'process_outputs_as_sources': 1,
+ 'msvs_cygwin_shell': 0,
+ 'msvs_quote_cmd': 0,
+ 'action': [
+ '"<(wix_path)\\candle"',
+ '"<(RULE_INPUT_PATH)"',
+ '-o <@(_outputs)',
+ '-ext "<(wix_path)\\WixFirewallExtension.dll"',
+ ],
+ 'message': 'Candle: compiling <(RULE_INPUT_PATH)',
+ },
+ {
+ 'rule_name': 'light',
+ 'extension': 'wixobj',
+ 'outputs': [
+ '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT)-test.msi',
+ ],
+ 'msvs_cygwin_shell': 0,
+ 'msvs_quote_cmd': 0,
+ 'action': [
+ '"<(wix_path)\\light"',
+ '"<(RULE_INPUT_PATH)"',
+ '-o <@(_outputs)',
+ '-ext "<(wix_path)\\WixFirewallExtension.dll"',
+ '-sw1076',
+ ],
+ 'message': 'Light: linking <(RULE_INPUT_PATH)',
+ },
+ ],
+ }, # end of target 'remoting_host_installation_unittest'
], # end of 'targets'
}], # '<(wix_path) != ""'
Please sign in to comment.
Something went wrong with that request. Please try again.