Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-15 07:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

renames: test -> test-mocha and test-electron -> test

Browse Source
This commit is contained in:
Johannes Rieken
2017-04-04 17:03:39 +02:00
parent e2d30cc1f3
commit 8a73c7d0b4
6 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -44,8 +44,7 @@ script:
- gulp electron --silent
- gulp compile --silent --max_old_space_size=4096
- gulp optimize-vscode --silent --max_old_space_size=4096
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --reporter dot --coverage; else ./scripts/test.sh --reporter dot; fi
- ./scripts/test-electron.sh
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --coverage; else ./scripts/test.sh; fi
- ./scripts/test-integration.sh
after_success:

1
appveyor.yml
View File

@@ -16,5 +16,4 @@ test_script:
- node --version
- npm --version
- .\scripts\test.bat
- .\scripts\test-electron.bat
- .\scripts\test-integration.bat

14
scripts/test-electron.bat → scripts/test-mocha.bat
View File

@@ -1,7 +1,7 @@
@echo off
setlocal
set ELECTRON_RUN_AS_NODE=
set ELECTRON_RUN_AS_NODE=1
pushd %~dp0\..
@@ -10,10 +10,16 @@ set NAMESHORT=%NAMESHORT: "=%
set NAMESHORT=%NAMESHORT:"=%.exe
set CODE=".build\electron\%NAMESHORT%"
rem Run tests in electron
%CODE% .\test\electron\index.js %*
rem TFS Builds
if not "%BUILD_BUILDID%" == "" (
%CODE% .\node_modules\mocha\bin\_mocha %*
)
rem Otherwise
if "%BUILD_BUILDID%" == "" (
%CODE% .\node_modules\mocha\bin\_mocha --reporter dot %*
)
popd
endlocal
exit /b %errorlevel%
exit /b %errorlevel%

10
scripts/test-electron.sh → scripts/test-mocha.sh
View File

@@ -28,15 +28,15 @@ test -d node_modules || ./scripts/npm.sh install
# Build
test -d out || ./node_modules/.bin/gulp compile
echo "code $CODE"
# Unit Tests
export VSCODE_DEV=1
if [[ "$OSTYPE" == "darwin"* ]]; then
cd $ROOT ; ulimit -n 4096 ; \
cd $ROOT ; ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \
"$CODE" \
test/electron/index.js "$@"
node_modules/mocha/bin/_mocha "$@"
else
cd $ROOT ; \
cd $ROOT ; ELECTRON_RUN_AS_NODE=1 \
"$CODE" \
test/electron/index.js "$@"
node_modules/mocha/bin/_mocha "$@"
fi

14
scripts/test.bat
View File

@@ -1,7 +1,7 @@
@echo off
setlocal
set ELECTRON_RUN_AS_NODE=1
set ELECTRON_RUN_AS_NODE=
pushd %~dp0\..
@@ -10,16 +10,10 @@ set NAMESHORT=%NAMESHORT: "=%
set NAMESHORT=%NAMESHORT:"=%.exe
set CODE=".build\electron\%NAMESHORT%"
rem TFS Builds
if not "%BUILD_BUILDID%" == "" (
%CODE% .\node_modules\mocha\bin\_mocha %*
)
rem Run tests in electron
%CODE% .\test\electron\index.js %*
rem Otherwise
if "%BUILD_BUILDID%" == "" (
%CODE% .\node_modules\mocha\bin\_mocha --reporter dot %*
)
popd
endlocal
exit /b %errorlevel%
exit /b %errorlevel%

10
scripts/test.sh
View File

@@ -28,15 +28,15 @@ test -d node_modules || ./scripts/npm.sh install
# Build
test -d out || ./node_modules/.bin/gulp compile
echo "code $CODE"
# Unit Tests
export VSCODE_DEV=1
if [[ "$OSTYPE" == "darwin"* ]]; then
cd $ROOT ; ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \
cd $ROOT ; ulimit -n 4096 ; \
"$CODE" \
node_modules/mocha/bin/_mocha "$@"
test/electron/index.js "$@"
else
cd $ROOT ; ELECTRON_RUN_AS_NODE=1 \
cd $ROOT ; \
"$CODE" \
node_modules/mocha/bin/_mocha "$@"
test/electron/index.js "$@"
fi