X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Ftravis.sh;h=5d195f902baae8f3de4abc6b52ff1fa4eedcb9a9;hb=f7509cbec875ec4ee3201cce08839f2a02676c1c;hp=4b584cbe78b37941527cd2bb2ba82ee660c28f72;hpb=01bc6ac6f0480f0b78617169ab4574df6c275552;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/travis.sh b/scripts/travis.sh
index 4b584cbe7..5d195f902 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -1,29 +1,41 @@
-#!/bin/bash
+#!/bin/sh
+
+set -eu
 
 if [ $# -eq 0 ]; then
     echo "Need test suite argument."
     exit -1
 fi
 
+killall -q peertube || true
+
 if [ "$1" = "misc" ]; then
-    npm run build
-    mocha --exit --require ts-node/register/type-check --bail server/tests/client.ts server/tests/activitypub.ts
+    npm run build -- --light-fr
+    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/client.ts server/tests/activitypub.ts \
+        server/tests/feeds/index.ts server/tests/misc-endpoints.ts
 elif [ "$1" = "api" ]; then
     npm run build:server
-    mocha --exit --require ts-node/register/type-check --bail server/tests/api/index.ts
+    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index.ts
 elif [ "$1" = "cli" ]; then
     npm run build:server
-    mocha --exit --require ts-node/register/type-check --bail server/tests/cli/index.ts
-elif [ "$1" = "api-fast" ]; then
+    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/cli/index.ts
+elif [ "$1" = "api-1" ]; then
+    npm run build:server
+    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-1.ts
+elif [ "$1" = "api-2" ]; then
     npm run build:server
-    mocha --exit --require ts-node/register/type-check --bail server/tests/api/index-fast.ts
-elif [ "$1" = "api-slow" ]; then
+    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-2.ts
+elif [ "$1" = "api-3" ]; then
     npm run build:server
-    mocha --exit --require ts-node/register/type-check --bail server/tests/api/index-slow.ts
+    mocha --timeout 5000 --exit --require ts-node/register/type-check --bail server/tests/api/index-3.ts
 elif [ "$1" = "lint" ]; then
-    cd client || exit -1
-    npm run lint || exit -1
+    npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" "shared/**/*.ts"
 
-    cd .. || exit -1
-    npm run tslint -- --project ./tsconfig.json -c ./tslint.json server.ts "server/**/*.ts" || exit -1
+    ( cd client
+      npm run lint
+    )
+elif [ "$1" = "jest" ]; then
+    ( cd client
+      npm run test
+    )
 fi