diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-20 21:35:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 21:35:34 +0200 |
| commit | e205785b5c442517171530320d70691b79d4fc77 (patch) | |
| tree | 9db95cead55ec7d0a68bd137baa0c2ed9bd2bb3f /coin | |
| parent | 8ddc3c1254149920b8ad9e691ea65c88fd149ee2 (diff) | |
| parent | 49f1a7f0a61dfcb6a2b38f5f5c2ce4fdccc815e9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I2e0204f745b482e4faa210ec7f8b95463267b3ca
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/README | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/icu.ps1 | 5 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/jom.ps1 | 5 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/icu.ps1 | 5 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/jom.ps1 | 5 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/icu.ps1 | 5 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/jom.ps1 | 5 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-8-x86/icu.ps1 | 5 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-8-x86/jom.ps1 | 5 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-8-x86_64/icu.ps1 | 5 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-8-x86_64/jom.ps1 | 5 |
11 files changed, 2 insertions, 50 deletions
diff --git a/coin/README b/coin/README index 891d7202..2fb3fe2d 100644 --- a/coin/README +++ b/coin/README @@ -6,4 +6,6 @@ This directory contains files used by Qt's Continuous Integration system (Coin). provisioning ------------ Contains scripts that apply to different test machines in order to run automatic tests on them. +For Windows scripts, make sure that the machine has "Set-ExecutionPolicy RemoteSigned -Force" set. +(Run as admin in PowerShell) diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-10-x86/icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-10-x86/jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-7-x86/icu.ps1 b/coin/provisioning/qtci-windows-7-x86/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-7-x86/icu.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-7-x86/jom.ps1 b/coin/provisioning/qtci-windows-7-x86/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-7-x86/jom.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86/icu.ps1 b/coin/provisioning/qtci-windows-8-x86/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-8-x86/icu.ps1 +++ b/coin/provisioning/qtci-windows-8-x86/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86/jom.ps1 b/coin/provisioning/qtci-windows-8-x86/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-8-x86/jom.ps1 +++ b/coin/provisioning/qtci-windows-8-x86/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 +++ b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 +++ b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force |