diff --git a/utils/hct/hctdeploytest.cmd b/utils/hct/hctdeploytest.cmd deleted file mode 100644 index 720a375f10..0000000000 --- a/utils/hct/hctdeploytest.cmd +++ /dev/null @@ -1,60 +0,0 @@ -@echo off -setlocal ENABLEDELAYEDEXPANSION - -if "%1"=="" goto :showhelp -if "%1"=="/?" goto :showhelp -if "%1"=="-?" goto :showhelp -if "%1"=="/h" goto :showhelp -if "%1"=="-h" goto :showhelp -if "%1"=="-help" goto :showhelp -if "%1"=="--help" goto :showhelp - -if "%BUILD_CONFIG%"=="" ( - set BUILD_CONFIG=Debug -) - -set TEST_DIR=%HLSL_BLD_DIR%\%BUILD_CONFIG%\test -set DEPLOY_DIR=%1 - -if not exist %HLSL_SRC_DIR%\external\taef\. ( - call hctgettaef.py - if errorlevel 1 ( - echo hctgettaef.py failed with errorlevel !errorlevel! - exit /b 1 - ) -) - -rem Deploy test content to test directory -call hcttest.cmd none -if errorlevel 1 ( - echo test deployment with 'hcttest none' failed with errorlevel !errorlevel! - exit /b 1 -) - -robocopy /S %HLSL_SRC_DIR%\external\taef\build\Binaries %DEPLOY_DIR%\taef * -robocopy /S %TEST_DIR% %DEPLOY_DIR%\test * -robocopy /S %HLSL_SRC_DIR%\tools\clang\test\HLSL %DEPLOY_DIR%\HLSL * -robocopy /S %HLSL_SRC_DIR%\tools\clang\test\CodeGenHLSL %DEPLOY_DIR%\CodeGenHLSL * - -echo ========================================================================= -echo Provided there were no errors above, the test can now be run from -echo the target directory with: -echo. -echo taef\amd64\te test\ClangHLSLTests.dll /p:"HlslDataDir=HLSL" [options] -echo. -echo You may need to deploy VS runtime libraries in order to run the unit tests. -echo Debug versions of these will be required for the Debug build configuration. -echo Here are some dll's that may be required: -echo msvcp140.dll -echo msvcp140d.dll -echo ucrtbased.dll -echo vcruntime140.dll -echo vcruntime140d.dll -echo. -exit /b 0 - -:showhelp -echo Usage: -echo hctdeploytest target-directory -echo. -goto :eof diff --git a/utils/hct/hctgettaef.py b/utils/hct/hctgettaef.py deleted file mode 100644 index a02d753e00..0000000000 --- a/utils/hct/hctgettaef.py +++ /dev/null @@ -1,38 +0,0 @@ -import urllib.request -import os -import ssl -import zipfile - -url = "https://github.com/Microsoft/WinObjC/raw/develop/deps/prebuilt/nuget/taef.redist.wlk.1.0.170206001-nativetargets.nupkg" -zipfile_name = os.path.join( - os.environ["TEMP"], "taef.redist.wlk.1.0.170206001-nativetargets.nupkg.zip" -) -src_dir = os.environ["HLSL_SRC_DIR"] -taef_dir = os.path.join(src_dir, "external", "taef") - -os.makedirs(taef_dir, exist_ok=True) - -try: - ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) - response = urllib.request.urlopen(url, context=ctx) - f = open(zipfile_name, "wb") - f.write(response.read()) - f.close() -except: - print("Unable to read file with urllib, trying via powershell...") - from subprocess import check_call - - cmd = "" - cmd += "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;" - cmd += ( - "(new-object System.Net.WebClient).DownloadFile('" - + url - + "', '" - + zipfile_name - + "')" - ) - check_call(["powershell.exe", "-Command", cmd]) - -z = zipfile.ZipFile(zipfile_name) -z.extractall(taef_dir) -z.close() diff --git a/utils/hct/hctstart.cmd b/utils/hct/hctstart.cmd index 5a5941a15e..642ca5bf1d 100644 --- a/utils/hct/hctstart.cmd +++ b/utils/hct/hctstart.cmd @@ -167,8 +167,7 @@ if exist "%HLSL_SRC_DIR%\external\taef\build\Binaries\amd64\TE.exe" set path=%pa where te.exe 1>nul 2>nul if errorlevel 1 ( echo Unable to find TAEF te.exe on path - you will have to add this before running tests. - echo WDK includes TAEF and is available from https://msdn.microsoft.com/en-us/windows/hardware/dn913721.aspx - echo Alternatively, consider a project-local install by running %HLSL_SRC_DIR%\utils\hct\hctgettaef.py + echo WDK includes TAEF and is available from https://learn.microsoft.com/en-us/windows-hardware/drivers/download-the-wdk echo Please see the README.md instructions in the project root. exit /b 1 )