From 90964290a66bdd1a1fe66eb29f3595ea8cace21c Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Thu, 25 May 2017 16:04:38 -0700
Subject: [PATCH] Add separate run script just to rebuild test modules

---
 package.json                   |  1 +
 script/rebuild-test-modules.py | 64 ++++++++++++++++++++++++++++++++++
 script/test.py                 | 41 +++++-----------------
 3 files changed, 74 insertions(+), 32 deletions(-)
 create mode 100755 script/rebuild-test-modules.py

diff --git a/package.json b/package.json
index 8f7badda1..1e227e669 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "browserify": "browserify",
     "bump-version": "./script/bump-version.py",
     "build": "python ./script/build.py -c D",
+    "rebuild-test-modules": "python ./script/rebuild-test-modules.py",
     "clean": "python ./script/clean.py",
     "clean-build": "python ./script/clean.py --build",
     "coverage": "npm run instrument-code-coverage && npm test -- --use_instrumented_asar",
diff --git a/script/rebuild-test-modules.py b/script/rebuild-test-modules.py
new file mode 100755
index 000000000..7cbb189f5
--- /dev/null
+++ b/script/rebuild-test-modules.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+
+import argparse
+import os
+import shutil
+import subprocess
+import sys
+
+from lib.config import PLATFORM, enable_verbose_mode, get_target_arch
+from lib.util import execute_stdout, get_electron_version, safe_mkdir, \
+                     update_node_modules, update_electron_modules
+
+
+SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+
+
+def main():
+  os.chdir(SOURCE_ROOT)
+
+  args = parse_args()
+  config = args.configuration
+
+  if args.verbose:
+    enable_verbose_mode()
+
+  spec_modules = os.path.join(SOURCE_ROOT, 'spec', 'node_modules')
+  out_dir = os.path.join(SOURCE_ROOT, 'out', config)
+  version = get_electron_version()
+  node_dir = os.path.join(out_dir, 'node-{0}'.format(version))
+
+  # Create node headers
+  script_path = os.path.join(SOURCE_ROOT, 'script', 'create-node-headers.py')
+  execute_stdout([sys.executable, script_path, '--version', version,
+                  '--directory', out_dir])
+
+  if PLATFORM == 'win32':
+    lib_dir = os.path.join(node_dir, 'Release')
+    safe_mkdir(lib_dir)
+    iojs_lib = os.path.join(lib_dir, 'iojs.lib')
+    atom_lib = os.path.join(out_dir, 'node.dll.lib')
+    shutil.copy2(atom_lib, iojs_lib)
+
+  # Native modules can only be compiled against release builds on Windows
+  if config == 'R' or PLATFORM != 'win32':
+    update_electron_modules(os.path.dirname(spec_modules), get_target_arch(),
+                            node_dir)
+  else:
+    update_node_modules(os.path.dirname(spec_modules))
+
+
+def parse_args():
+  parser = argparse.ArgumentParser(description='Rebuild native test modules')
+  parser.add_argument('-v', '--verbose',
+                      action='store_true',
+                      help='Prints the output of the subprocesses')
+  parser.add_argument('-c', '--configuration',
+                      help='Build configuration to rebuild modules against',
+                      default='D',
+                      required=False)
+  return parser.parse_args()
+
+
+if __name__ == '__main__':
+  sys.exit(main())
diff --git a/script/test.py b/script/test.py
index 07f397bd3..804bce9eb 100755
--- a/script/test.py
+++ b/script/test.py
@@ -6,9 +6,8 @@ import shutil
 import subprocess
 import sys
 
-from lib.config import PLATFORM, enable_verbose_mode, get_target_arch
-from lib.util import electron_gyp, execute, get_electron_version, rm_rf, \
-                     safe_mkdir, update_node_modules, update_electron_modules
+from lib.config import enable_verbose_mode
+from lib.util import electron_gyp, execute_stdout, rm_rf
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
@@ -28,7 +27,7 @@ def main():
 
   spec_modules = os.path.join(SOURCE_ROOT, 'spec', 'node_modules')
   if args.rebuild_native_modules or not os.path.isdir(spec_modules):
-    rebuild_native_modules(config, spec_modules)
+    rebuild_native_modules(args.verbose, config)
 
   if sys.platform == 'darwin':
     electron = os.path.join(SOURCE_ROOT, 'out', config,
@@ -110,34 +109,12 @@ def restore_uninstrumented_asar_file(resources_path):
   shutil.move(uninstrumented_path, asar_path)
 
 
-def run_python_script(script, *args):
-  script_path = os.path.join(SOURCE_ROOT, 'script', script)
-  return execute([sys.executable, script_path] + list(args))
-
-
-def rebuild_native_modules(config, modules_path):
-  out_dir = os.path.join(SOURCE_ROOT, 'out', config)
-  version = get_electron_version()
-  node_dir = os.path.join(out_dir, 'node-{0}'.format(version))
-
-  run_python_script('create-node-headers.py',
-                    '--version', version,
-                    '--directory', out_dir)
-
-  if PLATFORM == 'win32':
-    lib_dir = os.path.join(node_dir, 'Release')
-    safe_mkdir(lib_dir)
-    iojs_lib = os.path.join(lib_dir, 'iojs.lib')
-    atom_lib = os.path.join(out_dir, 'node.dll.lib')
-    shutil.copy2(atom_lib, iojs_lib)
-
-  # Native modules can only be compiled against release builds on Windows
-  if config == 'R' or PLATFORM != 'win32':
-    update_electron_modules(os.path.dirname(modules_path), get_target_arch(),
-                            node_dir)
-  else:
-    update_node_modules(os.path.dirname(modules_path))
-
+def rebuild_native_modules(verbose, configuration):
+  script_path = os.path.join(SOURCE_ROOT, 'script', 'rebuild-test-modules.py')
+  args = ['--configuration', configuration]
+  if verbose:
+    args += ['--verbose']
+  execute_stdout([sys.executable, script_path] + args)
 
 if __name__ == '__main__':
   sys.exit(main())