From aab85286b7e0122e736404c95873559422952161 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Thu, 28 Jul 2022 19:09:35 +0200
Subject: [PATCH] Fix calling of script creating shared folders
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The calling script for each platform missed the leading ". " so
powershell never executed the script. Sadly, provisioning still
succeeded.

Add some log output to the script doing the work to verify that
the file system is what is expected to be at the end. If it's not,
then the cd'ing into the shares will fail and the script will
return with a non-zero exit.

Pick-to: 6.4
Change-Id: I8fe85c7e202132525876cdddf41750732f69aaf9
Reviewed-by: Simo Fält <simo.falt@qt.io>
---
 .../provisioning/common/windows/share-test-folders.ps1 | 10 ++++++++++
 .../qtci-windows-10-x86/99-share-test-folders.ps1      |  2 +-
 .../qtci-windows-10-x86_64/99-share-test-folders.ps1   |  2 +-
 .../99-share-test-folders.ps1                          |  2 +-
 .../99-share-test-folders.ps1                          |  2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/coin/provisioning/common/windows/share-test-folders.ps1 b/coin/provisioning/common/windows/share-test-folders.ps1
index d6666b9d..34363d6d 100644
--- a/coin/provisioning/common/windows/share-test-folders.ps1
+++ b/coin/provisioning/common/windows/share-test-folders.ps1
@@ -45,6 +45,8 @@ $writable='testsharewritable'
 $readonlypath="${env:SystemDrive}\${readonly}"
 $writablepath="${env:SystemDrive}\${writable}"
 
+Write-Host "******************** Creating folders ${readonlpath} and ${writablepath}"
+
 if ($(Test-Path -Path $readonlypath)) {
     Remove-SmbShare -Name $readonly -Force
     Remove-Item -Path $readonlypath -Force -Recurse
@@ -64,3 +66,11 @@ New-Item "${readonlypath}\readme.txt" -ItemType File
 
 New-Item ${writablepath} -ItemType Directory
 New-SmbShare -Name ${writable} -Path ${writablepath} -ChangeAccess Users
+
+Write-Host "******************** File system content"
+dir ${env:SystemDrive}
+cd "\\${env:COMPUTERNAME}\${readonly}"
+dir
+cd "\\${env:COMPUTERNAME}\${writable}"
+dir
+Write-Host "******************** Done Content"
diff --git a/coin/provisioning/qtci-windows-10-x86/99-share-test-folders.ps1 b/coin/provisioning/qtci-windows-10-x86/99-share-test-folders.ps1
index 28bfec91..576fcfdc 100644
--- a/coin/provisioning/qtci-windows-10-x86/99-share-test-folders.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/99-share-test-folders.ps1
@@ -1 +1 @@
-"$PSScriptRoot\..\common\windows\share-test-folders.ps1"
+. "$PSScriptRoot\..\common\windows\share-test-folders.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/99-share-test-folders.ps1 b/coin/provisioning/qtci-windows-10-x86_64/99-share-test-folders.ps1
index 28bfec91..576fcfdc 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/99-share-test-folders.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/99-share-test-folders.ps1
@@ -1 +1 @@
-"$PSScriptRoot\..\common\windows\share-test-folders.ps1"
+. "$PSScriptRoot\..\common\windows\share-test-folders.ps1"
diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/99-share-test-folders.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/99-share-test-folders.ps1
index 28bfec91..576fcfdc 100644
--- a/coin/provisioning/qtci-windows-10_21H2-x86_64/99-share-test-folders.ps1
+++ b/coin/provisioning/qtci-windows-10_21H2-x86_64/99-share-test-folders.ps1
@@ -1 +1 @@
-"$PSScriptRoot\..\common\windows\share-test-folders.ps1"
+. "$PSScriptRoot\..\common\windows\share-test-folders.ps1"
diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/99-share-test-folders.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/99-share-test-folders.ps1
index 28bfec91..576fcfdc 100644
--- a/coin/provisioning/qtci-windows-11_21H2-x86_64/99-share-test-folders.ps1
+++ b/coin/provisioning/qtci-windows-11_21H2-x86_64/99-share-test-folders.ps1
@@ -1 +1 @@
-"$PSScriptRoot\..\common\windows\share-test-folders.ps1"
+. "$PSScriptRoot\..\common\windows\share-test-folders.ps1"