From 3bc4ee787ea1144af1f980194bc81bddb978aacc Mon Sep 17 00:00:00 2001
From: "Sakthipriyan Vairamani (thefourtheye)" <thechargingvolcano@gmail.com>
Date: Mon, 30 Jan 2017 21:52:44 +0530
Subject: [PATCH 1/2] build: make local & ci test the same subsytems

1. In Makefile, though CI and local test tests the same subsystems,
   CI target uses a variable and the local test enumerates the
   subsystems being tested. This patch makes both of them to use the
   same variable.

2. In vcbuild.bat, the inspector tests are not run when tested locally.
   This patch makes sure that they both use the same set of subsysterms
   set in a variable.
---
 Makefile    | 6 +++---
 vcbuild.bat | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7cd85983708fbd..1c79d27daf9403 100644
--- a/Makefile
+++ b/Makefile
@@ -123,8 +123,7 @@ v8:
 test: all
 	$(MAKE) build-addons
 	$(MAKE) cctest
-	$(PYTHON) tools/test.py --mode=release -J \
-		addons doctool inspector known_issues message pseudo-tty parallel sequential
+	$(PYTHON) tools/test.py --mode=release -J $(CI_JS_SUITES) $(CI_NATIVE_SUITES)
 	$(MAKE) lint
 
 test-parallel: all
@@ -200,7 +199,8 @@ test-all-valgrind: test-build
 	$(PYTHON) tools/test.py --mode=debug,release --valgrind
 
 CI_NATIVE_SUITES := addons
-CI_JS_SUITES := doctool inspector known_issues message parallel pseudo-tty sequential
+CI_JS_SUITES := doctool inspector known_issues message parallel \
+	pseudo-tty sequential
 
 # Build and test addons without building anything else
 test-ci-native: LOGLEVEL := info
diff --git a/vcbuild.bat b/vcbuild.bat
index bc578c8f1d2269..db50372e562a60 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -39,6 +39,7 @@ set enable_vtune_arg=
 set configure_flags=
 set build_addons=
 set dll=
+set ci_test_targets="addons doctool inspector known_issues message parallel sequential"
 
 :next-arg
 if "%1"=="" goto args-done
@@ -57,8 +58,8 @@ if /i "%1"=="nosnapshot"    set nosnapshot=1&goto arg-ok
 if /i "%1"=="noetw"         set noetw=1&goto arg-ok
 if /i "%1"=="noperfctr"     set noperfctr=1&goto arg-ok
 if /i "%1"=="licensertf"    set licensertf=1&goto arg-ok
-if /i "%1"=="test"          set test_args=%test_args% addons doctool known_issues message parallel sequential -J&set jslint=1&set build_addons=1&goto arg-ok
-if /i "%1"=="test-ci"       set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap addons doctool inspector known_issues message sequential parallel&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&set build_addons=1&goto arg-ok
+if /i "%1"=="test"          set test_args=%test_args% %ci_test_targets% -J&set jslint=1&set build_addons=1&goto arg-ok
+if /i "%1"=="test-ci"       set test_args=%test_args% %test_ci_args% -p tap --logfile test.tap %ci_test_targets%&set cctest_args=%cctest_args% --gtest_output=tap:cctest.tap&set build_addons=1&goto arg-ok
 if /i "%1"=="test-addons"   set test_args=%test_args% addons&set build_addons=1&goto arg-ok
 if /i "%1"=="test-simple"   set test_args=%test_args% sequential parallel -J&goto arg-ok
 if /i "%1"=="test-message"  set test_args=%test_args% message&goto arg-ok

From e6b277cc383e79c91a04d80c0a068d715fbd0d26 Mon Sep 17 00:00:00 2001
From: "Sakthipriyan Vairamani (thefourtheye)" <thechargingvolcano@gmail.com>
Date: Mon, 30 Jan 2017 21:58:21 +0530
Subject: [PATCH 2/2] build: enable debugger tests in CI

All the problems blocking https://github.com/nodejs/node/issues/10361
have been resolved. This patch enables debugger in CI.
---
 Makefile    | 2 +-
 vcbuild.bat | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1c79d27daf9403..58a334bec1dbf2 100644
--- a/Makefile
+++ b/Makefile
@@ -199,7 +199,7 @@ test-all-valgrind: test-build
 	$(PYTHON) tools/test.py --mode=debug,release --valgrind
 
 CI_NATIVE_SUITES := addons
-CI_JS_SUITES := doctool inspector known_issues message parallel \
+CI_JS_SUITES := debugger doctool inspector known_issues message parallel \
 	pseudo-tty sequential
 
 # Build and test addons without building anything else
diff --git a/vcbuild.bat b/vcbuild.bat
index db50372e562a60..f03196be2c31ee 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -39,7 +39,7 @@ set enable_vtune_arg=
 set configure_flags=
 set build_addons=
 set dll=
-set ci_test_targets="addons doctool inspector known_issues message parallel sequential"
+set ci_test_targets="addons debugger doctool inspector known_issues message parallel sequential"
 
 :next-arg
 if "%1"=="" goto args-done