diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-05-16 08:43:35 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-05-16 08:43:35 +0200 |
| commit | bec4ea343987c69252b84d02f444c0f033d4a3f9 (patch) | |
| tree | c0c709104aa97f1b5472a17e3e0c1436ab2dab06 /scripts | |
| parent | ab5f9ed86e08cb7de3a1be955ca991a4517bdc57 (diff) | |
| parent | d183ee9bda2588f07032ca4a2fce58651e684abf (diff) | |
| download | PeerTube-bec4ea343987c69252b84d02f444c0f033d4a3f9.tar.gz PeerTube-bec4ea343987c69252b84d02f444c0f033d4a3f9.tar.zst PeerTube-bec4ea343987c69252b84d02f444c0f033d4a3f9.zip | |
Merge branch 'feature/parallel-tests' into develop
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/travis.sh b/scripts/travis.sh index 3557816c8..c38bd2cab 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh | |||
| @@ -20,16 +20,16 @@ elif [ "$1" = "cli" ]; then | |||
| 20 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/cli/index.ts | 20 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/cli/index.ts |
| 21 | elif [ "$1" = "api-1" ]; then | 21 | elif [ "$1" = "api-1" ]; then |
| 22 | npm run build:server | 22 | npm run build:server |
| 23 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-1.ts | 23 | sh ./server/tests/api/travis-1.sh 2 |
| 24 | elif [ "$1" = "api-2" ]; then | 24 | elif [ "$1" = "api-2" ]; then |
| 25 | npm run build:server | 25 | npm run build:server |
| 26 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-2.ts | 26 | sh ./server/tests/api/travis-2.sh 2 |
| 27 | elif [ "$1" = "api-3" ]; then | 27 | elif [ "$1" = "api-3" ]; then |
| 28 | npm run build:server | 28 | npm run build:server |
| 29 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-3.ts | 29 | sh ./server/tests/api/travis-3.sh 2 |
| 30 | elif [ "$1" = "api-4" ]; then | 30 | elif [ "$1" = "api-4" ]; then |
| 31 | npm run build:server | 31 | npm run build:server |
| 32 | mocha --timeout 5000 --exit --require ts-node/register --bail server/tests/api/index-4.ts | 32 | sh ./server/tests/api/travis-4.sh 2 |
| 33 | elif [ "$1" = "lint" ]; then | 33 | elif [ "$1" = "lint" ]; then |
| 34 | npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts" | 34 | npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts" |
| 35 | 35 | ||