ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove leftover merge tags from windows integration test script. (#4213)

Browse Source
This commit is contained in:
Cory Rivera
2019-02-26 18:02:13 -08:00
committed by GitHub
parent 4da322a03f
commit 12a1ac1a7d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/test-integration.bat
View File

@@ -25,14 +25,10 @@ if %errorlevel% neq 0 exit /b %errorlevel%
:: call .\scripts\code.bat $%~dp0\..\extensions\emmet\test-fixtures --extensionDevelopmentPath=%~dp0\..\extensions\emmet --extensionTestsPath=%~dp0\..\extensions\emmet\out\test --disableExtensions --user-data-dir=%VSCODEUSERDATADIR% . :: call .\scripts\code.bat $%~dp0\..\extensions\emmet\test-fixtures --extensionDevelopmentPath=%~dp0\..\extensions\emmet --extensionTestsPath=%~dp0\..\extensions\emmet\out\test --disableExtensions --user-data-dir=%VSCODEUSERDATADIR% .
:: if %errorlevel% neq 0 exit /b %errorlevel% :: if %errorlevel% neq 0 exit /b %errorlevel%
<<<<<<< HEAD
:: Integration & performance tests in AMD :: Integration & performance tests in AMD
call .\scripts\test.bat --runGlob **\*.integrationTest.js %* call .\scripts\test.bat --runGlob **\*.integrationTest.js %*
:: Tests in commonJS (HTML, CSS, JSON language server tests...) :: Tests in commonJS (HTML, CSS, JSON language server tests...)
=======
# Tests in commonJS (HTML, CSS, JSON language server tests...)
>>>>>>> vscode/release/1.30
call .\scripts\node-electron.bat .\node_modules\mocha\bin\_mocha .\extensions\*\server\out\test\**\*.test.js call .\scripts\node-electron.bat .\node_modules\mocha\bin\_mocha .\extensions\*\server\out\test\**\*.test.js
if %errorlevel% neq 0 exit /b %errorlevel% if %errorlevel% neq 0 exit /b %errorlevel%