From 97709856d15bfad74f099467107cb3740c2e620b Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 27 Jun 2022 11:19:11 +0200 Subject: [PATCH] Add script to create shared folders for testing Qt I/O with UNC paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Once these paths exist reliably on the Windows VM running the test, and are shared, we can access them through UNC paths as \\${COMPUTERNAME}\testshare This allows us to remove dependencies to network infrastructure from those QtCore tests. The test needs to run last, as otherwise the Visual Studio installer mysteriously fails to execute. So make some space at the end of the script list. Change-Id: Ie11b894f000722a7d99b2c5e279c1b0b63021003 Reviewed-by: Simo Fält (cherry picked from commit 72ac09708252963b294884708121ea680691a64e) Reviewed-by: Qt Cherry-pick Bot --- .../common/windows/share-test-folders.ps1 | 66 +++++++++++++++++++ .../99-share-test-folders.ps1 | 1 + ...> 96-disable-windows-module-installer.ps1} | 0 .../{99-msvc2015.ps1 => 97-msvc2015.ps1} | 0 .../{99-msvc2019.ps1 => 97-msvc2019.ps1} | 0 ...{99-unset-proxy.ps1 => 98-unset-proxy.ps1} | 0 .../99-share-test-folders.ps1 | 1 + ...> 96-disable-windows-module-installer.ps1} | 0 .../{99-msvc2015.ps1 => 97-msvc2015.ps1} | 0 ...{99-unset-proxy.ps1 => 98-unset-proxy.ps1} | 0 .../99-share-test-folders.ps1 | 1 + ...> 96-disable-windows-module-installer.ps1} | 0 .../{99-msvc2015.ps1 => 97-msvc2015.ps1} | 0 .../{99-msvc2019.ps1 => 97-msvc2019.ps1} | 0 ...{99-unset-proxy.ps1 => 98-unset-proxy.ps1} | 0 .../99-share-test-folders.ps1 | 1 + 16 files changed, 70 insertions(+) create mode 100644 coin/provisioning/common/windows/share-test-folders.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/99-share-test-folders.ps1 rename coin/provisioning/qtci-windows-10-x86_64/{98-disable-windows-module-installer.ps1 => 96-disable-windows-module-installer.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{99-msvc2015.ps1 => 97-msvc2015.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{99-msvc2019.ps1 => 97-msvc2019.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{99-unset-proxy.ps1 => 98-unset-proxy.ps1} (100%) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/99-share-test-folders.ps1 rename coin/provisioning/qtci-windows-10_21H2-x86_64/{98-disable-windows-module-installer.ps1 => 96-disable-windows-module-installer.ps1} (100%) rename coin/provisioning/qtci-windows-10_21H2-x86_64/{99-msvc2015.ps1 => 97-msvc2015.ps1} (100%) rename coin/provisioning/qtci-windows-10_21H2-x86_64/{99-unset-proxy.ps1 => 98-unset-proxy.ps1} (100%) create mode 100644 coin/provisioning/qtci-windows-10_21H2-x86_64/99-share-test-folders.ps1 rename coin/provisioning/qtci-windows-11_21H2-x86_64/{98-disable-windows-module-installer.ps1 => 96-disable-windows-module-installer.ps1} (100%) rename coin/provisioning/qtci-windows-11_21H2-x86_64/{99-msvc2015.ps1 => 97-msvc2015.ps1} (100%) rename coin/provisioning/qtci-windows-11_21H2-x86_64/{99-msvc2019.ps1 => 97-msvc2019.ps1} (100%) rename coin/provisioning/qtci-windows-11_21H2-x86_64/{99-unset-proxy.ps1 => 98-unset-proxy.ps1} (100%) create mode 100644 coin/provisioning/qtci-windows-11_21H2-x86_64/99-share-test-folders.ps1 diff --git a/coin/provisioning/common/windows/share-test-folders.ps1 b/coin/provisioning/common/windows/share-test-folders.ps1 new file mode 100644 index 00000000..d6666b9d --- /dev/null +++ b/coin/provisioning/common/windows/share-test-folders.ps1 @@ -0,0 +1,66 @@ +############################################################################# +## +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script creates and shares folders so that we can run I/O tests with +# UNC paths, without depending on an SBM server + +$readonly='testshare' +$writable='testsharewritable' +$readonlypath="${env:SystemDrive}\${readonly}" +$writablepath="${env:SystemDrive}\${writable}" + +if ($(Test-Path -Path $readonlypath)) { + Remove-SmbShare -Name $readonly -Force + Remove-Item -Path $readonlypath -Force -Recurse +} +if ($(Test-Path -Path $writablepath)) { + Remove-SmbShare -Name $writable -Force + Remove-Item -Path $writablepath -Force -Recurse +} + +New-Item ${readonlypath} -ItemType Directory +New-Item "${readonlypath}\tmp" -ItemType Directory +New-SmbShare -Name ${readonly} -Path ${readonlypath} -ReadAccess Users +# As expected by tst_networkselftest, exactly 34 bytes +"This is 34 bytes. Do not change..." ` + | Out-File -Encoding ascii -FilePath "${readonlypath}\test.pri" -NoNewline +New-Item "${readonlypath}\readme.txt" -ItemType File + +New-Item ${writablepath} -ItemType Directory +New-SmbShare -Name ${writable} -Path ${writablepath} -ChangeAccess Users 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 new file mode 100644 index 00000000..28bfec91 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/99-share-test-folders.ps1 @@ -0,0 +1 @@ +"$PSScriptRoot\..\common\windows\share-test-folders.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-module-installer.ps1 b/coin/provisioning/qtci-windows-10-x86_64/96-disable-windows-module-installer.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-module-installer.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/96-disable-windows-module-installer.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1 b/coin/provisioning/qtci-windows-10-x86_64/97-msvc2015.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/97-msvc2015.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/99-msvc2019.ps1 b/coin/provisioning/qtci-windows-10-x86_64/97-msvc2019.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/99-msvc2019.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/97-msvc2019.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/99-unset-proxy.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-unset-proxy.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/99-unset-proxy.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/98-unset-proxy.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 new file mode 100644 index 00000000..28bfec91 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/99-share-test-folders.ps1 @@ -0,0 +1 @@ +"$PSScriptRoot\..\common\windows\share-test-folders.ps1" diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/98-disable-windows-module-installer.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/96-disable-windows-module-installer.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10_21H2-x86_64/98-disable-windows-module-installer.ps1 rename to coin/provisioning/qtci-windows-10_21H2-x86_64/96-disable-windows-module-installer.ps1 diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/99-msvc2015.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/97-msvc2015.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10_21H2-x86_64/99-msvc2015.ps1 rename to coin/provisioning/qtci-windows-10_21H2-x86_64/97-msvc2015.ps1 diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/99-unset-proxy.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/98-unset-proxy.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10_21H2-x86_64/99-unset-proxy.ps1 rename to coin/provisioning/qtci-windows-10_21H2-x86_64/98-unset-proxy.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 new file mode 100644 index 00000000..28bfec91 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_21H2-x86_64/99-share-test-folders.ps1 @@ -0,0 +1 @@ +"$PSScriptRoot\..\common\windows\share-test-folders.ps1" diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/98-disable-windows-module-installer.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/96-disable-windows-module-installer.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-11_21H2-x86_64/98-disable-windows-module-installer.ps1 rename to coin/provisioning/qtci-windows-11_21H2-x86_64/96-disable-windows-module-installer.ps1 diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/99-msvc2015.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/97-msvc2015.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-11_21H2-x86_64/99-msvc2015.ps1 rename to coin/provisioning/qtci-windows-11_21H2-x86_64/97-msvc2015.ps1 diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/99-msvc2019.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/97-msvc2019.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-11_21H2-x86_64/99-msvc2019.ps1 rename to coin/provisioning/qtci-windows-11_21H2-x86_64/97-msvc2019.ps1 diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/99-unset-proxy.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/98-unset-proxy.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-11_21H2-x86_64/99-unset-proxy.ps1 rename to coin/provisioning/qtci-windows-11_21H2-x86_64/98-unset-proxy.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 new file mode 100644 index 00000000..28bfec91 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_21H2-x86_64/99-share-test-folders.ps1 @@ -0,0 +1 @@ +"$PSScriptRoot\..\common\windows\share-test-folders.ps1"