diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-12-05 12:19:57 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-12-05 14:32:56 -0800 |
| commit | 804c9e90fc4e7d11294fec69801ff7bc99134d3c (patch) | |
| tree | 7c089263ac79f422627a0509fd1a5ed82db98bb7 /tools | |
| parent | f1c85b0e752ecc5894ddd766cdea162defc8b352 (diff) | |
Add Electron tests to portability test matrix
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/test/node_jessie_x64/Dockerfile | 7 | ||||
| -rwxr-xr-x | tools/run_tests/build_node_electron.sh | 1 | ||||
| -rwxr-xr-x | tools/run_tests/pre_build_node_electron.sh | 2 | ||||
| -rwxr-xr-x | tools/run_tests/run_node_electron.sh | 1 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests_matrix.py | 9 |
5 files changed, 20 insertions, 0 deletions
diff --git a/tools/dockerfile/test/node_jessie_x64/Dockerfile b/tools/dockerfile/test/node_jessie_x64/Dockerfile index d9a7501829..120ea59ae2 100644 --- a/tools/dockerfile/test/node_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/node_jessie_x64/Dockerfile @@ -42,12 +42,18 @@ RUN apt-get update && apt-get install -y \ git \ golang \ gyp \ + libasound2 \ lcov \ libc6 \ libc6-dbg \ libc6-dev \ + libgconf-2-4 \ libgtest-dev \ + libgtk2.0-0 \ + libnss3 \ libtool \ + libxss1\ + libxtst6 \ make \ perl \ strace \ @@ -57,6 +63,7 @@ RUN apt-get update && apt-get install -y \ telnet \ unzip \ wget \ + xvfb \ zip && apt-get clean #================ diff --git a/tools/run_tests/build_node_electron.sh b/tools/run_tests/build_node_electron.sh index 4e7c3e4789..1c95c513b3 100755 --- a/tools/run_tests/build_node_electron.sh +++ b/tools/run_tests/build_node_electron.sh @@ -42,4 +42,5 @@ export npm_config_target=$ELECTRON_VERSION export npm_config_disturl=https://atom.io/download/atom-shell export npm_config_runtime=electron export npm_config_build_from_source=true +mkdir -p ~/.electron-gyp HOME=~/.electron-gyp npm install --unsafe-perm diff --git a/tools/run_tests/pre_build_node_electron.sh b/tools/run_tests/pre_build_node_electron.sh index d8d9df4ddb..95c56aa509 100755 --- a/tools/run_tests/pre_build_node_electron.sh +++ b/tools/run_tests/pre_build_node_electron.sh @@ -34,4 +34,6 @@ ELECTRON_VERSION=$1 nvm install 6 set -ex +npm install xvfb-maybe + npm install electron@$ELECTRON_VERSION diff --git a/tools/run_tests/run_node_electron.sh b/tools/run_tests/run_node_electron.sh index 7f8a824df2..1999ffb0fa 100755 --- a/tools/run_tests/run_node_electron.sh +++ b/tools/run_tests/run_node_electron.sh @@ -40,5 +40,6 @@ test_directory='src/node/test' timeout=8000 JUNIT_REPORT_PATH=src/node/report.xml JUNIT_REPORT_STACK=1 \ + ./node_modules/.bin/xvfb-maybe \ ./node_modules/.bin/electron-mocha --timeout $timeout \ --reporter mocha-jenkins-reporter $test_directory diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 989bc7eb21..d03e34766e 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -230,6 +230,15 @@ def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS) labels=['portability'], extra_args=extra_args, inner_jobs=inner_jobs) + + test_jobs += _generate_jobs(languages=['node'], + configs=['dbg'], + platforms=['linux'], + arch='default', + compiler='electron1.3', + labels=['portability'], + extra_args=extra_args, + inner_jobs=inner_jobs) return test_jobs |