DevTools: fix npm test debugging when using user compiled content shell

third_party/WebKit/Source/devtools/scripts/npm_test.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 var childProcess = require("child_process");
 var fs = require("fs");
 var path = require("path");
 var shell = require("child_process").execSync;
 
 var utils = require("./utils");
 
 var Flags = {
-    BUILD_ONLY: "--build-only",
     DEBUG_DEVTOOLS: "--debug-devtools",
     DEBUG_DEVTOOLS_SHORTHAND: "-d",
-    TEST_ONLY: "--test-only",
     FETCH_CONTENT_SHELL: "--fetch-content-shell",
 };
 
 var IS_DEBUG_ENABLED = utils.includes(process.argv, Flags.DEBUG_DEVTOOLS) ||
     utils.includes(process.argv, Flags.DEBUG_DEVTOOLS_SHORTHAND);
-var IS_BUILD_ONLY = utils.includes(process.argv, Flags.BUILD_ONLY);
-var IS_TEST_ONLY = utils.includes(process.argv, Flags.TEST_ONLY);
 var IS_FETCH_CONTENT_SHELL = utils.includes(process.argv, Flags.FETCH_CONTENT_SHELL);
 
 var CONTENT_SHELL_ZIP = "content-shell.zip";
 var MAX_CONTENT_SHELLS = 10;
 var PLATFORM = getPlatform();
 var PYTHON = process.platform === "win32" ? "python.bat" : "python";
 
 var CHROMIUM_SRC_PATH = path.resolve(__dirname, "..", "..", "..", "..", "..");
 var RELEASE_PATH = path.resolve(CHROMIUM_SRC_PATH, "out", "Release");
 var BLINK_TEST_PATH = path.resolve(CHROMIUM_SRC_PATH, "blink", "tools", "run_layout_tests.py");
 var CACHE_PATH = path.resolve(__dirname, "..", ".test_cache");
 var SOURCE_PATH = path.resolve(__dirname, "..", "front_end");
 
+var useDebugDevtools = true;
+
 function main(){
     var hasUserCompiledContentShell = utils.isFile(getContentShellBinaryPath(RELEASE_PATH));
     if (!IS_FETCH_CONTENT_SHELL && hasUserCompiledContentShell) {
         var outDir = path.resolve(RELEASE_PATH, "..");
         if (!IS_DEBUG_ENABLED) {
             console.log("Compiling devtools frontend");
             shell(`ninja -C ${RELEASE_PATH} devtools_frontend_resources`);
         }
-        runTests(outDir, {useRelease: !IS_DEBUG_ENABLED});
-        return;
-    }
-    if (IS_TEST_ONLY) {
-        findPreviousUploadedPosition(findMostRecentChromiumCommit())
-            .then(commitPosition => runTests(path.resolve(CACHE_PATH, commitPosition, "out"), {useRelease: false}));
+        if (!IS_DEBUG_ENABLED)
+            useDebugDevtools = false;
+        setupAndTest(outDir);
         return;
     }
     if (!utils.isDir(CACHE_PATH))
         fs.mkdirSync(CACHE_PATH);
     deleteOldContentShells();
     findPreviousUploadedPosition(findMostRecentChromiumCommit())
         .then(onUploadedCommitPosition)
         .catch(onError);
 
     function onError(error) {
         console.log("Unable to run tests because of error:", error);
         console.log(`Try removing the .test_cache folder [${CACHE_PATH}] and retrying`);
     }
 }
 main();
 
 function onUploadedCommitPosition(commitPosition)
 {
     var contentShellDirPath = path.resolve(CACHE_PATH, commitPosition, "out", "Release");
     var hasCachedContentShell = utils.isFile(getContentShellBinaryPath(contentShellDirPath));
     if (hasCachedContentShell) {
         var contentShellPath = path.resolve(CACHE_PATH, commitPosition, "out");
         console.log(`Using cached content shell at: ${contentShellPath}`);
-        return buildAndTest(contentShellPath);
+        return setupAndTest(contentShellPath);
     }
     return prepareContentShellDirectory(commitPosition)
         .then(downloadContentShell)
         .then(extractContentShell)
-        .then(buildAndTest);
+        .then(setupAndTest);
 }
 
 function getPlatform()
 {
     if (process.platform === "linux") {
         if (process.arch === "x64")
             return "Linux_x64";
         throw new Error("Pre-compiled content shells are only available for x64 on Linux");
     }
     if (process.platform === "win32") {
@@ skipping 117 matching lines @@
         return path.resolve(dirPath, "content_shell");
     }
     if (process.platform === "win32") {
         return path.resolve(dirPath, "content_shell.exe");
     }
     if (process.platform === "darwin") {
         return path.resolve(dirPath, "Content Shell.app", "Contents", "MacOS", "Content Shell");
     }
 }
 
-function buildAndTest(buildDirectoryPath)
+function setupAndTest(buildDirectoryPath)
 {
     var contentShellResourcesPath = path.resolve(buildDirectoryPath, "Release", "resources");
-    build(contentShellResourcesPath);
-    if (IS_BUILD_ONLY)
-        return;
-    runTests(buildDirectoryPath, {useRelease: false});
+    copyMetadata(contentShellResourcesPath);
+    runTests(buildDirectoryPath);
 }
 
-function build(contentShellResourcesPath)
+function copyMetadata(contentShellResourcesPath)
 {
     var devtoolsResourcesPath = path.resolve(contentShellResourcesPath, "inspector");
     var inspectorBackendCommandsPath = path.resolve(devtoolsResourcesPath, "InspectorBackendCommands.js");
     var supportedCSSPropertiesPath = path.resolve(devtoolsResourcesPath, "SupportedCSSProperties.js");
     utils.copy(inspectorBackendCommandsPath, SOURCE_PATH);
     utils.copy(supportedCSSPropertiesPath, SOURCE_PATH);
 }
 
-function runTests(buildDirectoryPath, options)
+function runTests(buildDirectoryPath)
 {
     var testArgs = getInspectorTests().concat([
         "--no-pixel-tests",
         "--build-directory",
         buildDirectoryPath,
     ]);
-    if (!options.useRelease) {
+    if (useDebugDevtools) {
         testArgs.push("--additional-driver-flag=--debug-devtools");
         testArgs.push(`--additional-driver-flag=--custom-devtools-frontend=${SOURCE_PATH}`);
     }
     if (IS_DEBUG_ENABLED) {
         testArgs.push("--additional-driver-flag=--remote-debugging-port=9222");
         testArgs.push("--time-out-ms=6000000");
         console.log("\n=============================================");
         console.log("Go to: http://localhost:9222/");
         console.log("Click on link and in console execute: test()");
         console.log("=============================================\n");
@@ skipping 14 matching lines @@
 function getInspectorTests()
 {
     var specificTests = process.argv.filter(arg => utils.includes(arg, "inspector"));
     if (specificTests.length)
         return specificTests;
     return [
         "inspector*",
         "http/tests/inspector*",
     ];
 }