Merge pull request #8496 from murgatroid99/node_7_artifacts

Build Node artifacts and allow Node tests for Node 7
pull/8516/head
Michael Lumish 8 years ago committed by GitHub
commit 5b36156d2b
  1. 4
      tools/run_tests/build_artifact_node.bat
  2. 2
      tools/run_tests/build_artifact_node.sh
  3. 5
      tools/run_tests/run_tests.py

@ -27,7 +27,7 @@
@rem (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
@rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set node_versions=0.12.0 1.0.0 1.1.0 2.0.0 3.0.0 4.0.0 5.0.0 6.0.0
set node_versions=0.12.0 1.0.0 1.1.0 2.0.0 3.0.0 4.0.0 5.0.0 6.0.0 7.0.0
set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm
@ -52,4 +52,4 @@ if %errorlevel% neq 0 exit /b %errorlevel%
goto :EOF
:error
exit /b 1
exit /b 1

@ -42,7 +42,7 @@ mkdir -p artifacts
npm update
node_versions=( 0.12.0 1.0.0 1.1.0 2.0.0 3.0.0 4.0.0 5.0.0 6.0.0 )
node_versions=( 0.12.0 1.0.0 1.1.0 2.0.0 3.0.0 4.0.0 5.0.0 6.0.0 7.0.0 )
for version in ${node_versions[@]}
do

@ -297,7 +297,8 @@ class NodeLanguage(object):
self.config = config
self.args = args
_check_compiler(self.args.compiler, ['default', 'node0.12',
'node4', 'node5', 'node6'])
'node4', 'node5', 'node6',
'node7'])
if self.args.compiler == 'default':
self.node_version = '4'
else:
@ -932,7 +933,7 @@ argp.add_argument('--compiler',
'clang3.4', 'clang3.5', 'clang3.6', 'clang3.7',
'vs2010', 'vs2013', 'vs2015',
'python2.7', 'python3.4',
'node0.12', 'node4', 'node5', 'node6',
'node0.12', 'node4', 'node5', 'node6', 'node7'
'coreclr'],
default='default',
help='Selects compiler to use. Allowed values depend on the platform and language.')

Loading…
Cancel
Save