(#5) Adapted test setup on Linux to gradually remove the container setup

nut-tree · Aug 12, 2020 · cdc0b2d · cdc0b2d
1 parent 373d39d
commit cdc0b2d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.build/build.sh b/.build/build.sh
@@ -21,11 +21,5 @@ echo "Entering working directory $targetDir"
 cd $targetDir
 echo "Installing node version $nodeVersion"
 nvm install $nodeVersion
-echo "npm ci"
-npm ci
-echo "npm run compile"
-npm run compile
-echo "init e2e test subpackage"
-npm --prefix e2e/tests ci
 echo "npm run coverage"
 E2E_TEST=1 npm run coverage
diff --git a/.build/run_linux.sh b/.build/run_linux.sh
@@ -3,4 +3,11 @@ set -e
 
 echo $PWD
 
+npm ci
+echo "npm run compile"
+npm run compile
+echo "init e2e test subpackage"
+npm --prefix e2e/tests ci
+echo "npm run coverage"
+E2E_TEST=1 npm run coverage
 docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} ${TRAVIS_NODE_VERSION}"
diff --git a/jest.config.js b/jest.config.js
@@ -8,7 +8,7 @@ module.exports = {
   preset: "ts-jest",
   testEnvironment: "node",
   testMatch: process.env.E2E_TEST ?
-    ["**/__tests__/?(e2e)/**/*.[jt]s?(x)", "**/?(*.)?(e2e.)+(spec|test).[jt]s?(x)"] :
+    ["**/__tests__/(e2e)/**/*.[jt]s?(x)", "**/?(*.)(e2e.)+(spec|test).[jt]s?(x)"] :
     ["**/__tests__/!(e2e)/**/*.[jt]s?(x)", "**/!(*.e2e.*)+(spec|test).[jt]s?(x)"],
   testPathIgnorePatterns: [
     "/node_modules/",