Merge pull request #616 from KoeMai/develop

Fix bug #601 Problem with CMake:Execute current target without debugger
microsoft · Apr 4, 2019 · 26f1519 · 26f1519
2 parents 8fefa74 + 7bb0dea
commit 26f1519
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/src/cmake-tools.ts b/src/cmake-tools.ts
@@ -1112,7 +1112,7 @@ export class CMakeTools implements vscode.Disposable, api.CMakeToolsAPI {
     };
     if (process.platform == 'win32') {
       // Use cmd.exe on Windows
-      termOptions.shellPath = 'C:/Windows/System32/cmd.exe';
+      termOptions.shellPath = 'C:\\Windows\\System32\\cmd.exe';
     }
     if (!this._launchTerminal)
       this._launchTerminal = vscode.window.createTerminal(termOptions);

diff --git a/test/extension-tests/successful-build/project-folder/main.cpp b/test/extension-tests/successful-build/project-folder/main.cpp
@@ -1,6 +1,7 @@
+#include <cstdlib>
+#include <fstream>
 #include <iostream>
 #include <string>
-#include <cstdlib>
 
 #ifndef _CMAKE_VERSION
     #define _CMAKE_VERSION "0.0"
@@ -29,4 +30,9 @@ int main(int, char**) {
     std::cout << "  \"build-env\": \"" << get_env_var("_BUILD_ENV") << "\",\n";
     std::cout << "  \"env\": \"" << get_env_var("_ENV") << "\"\n";
     std::cout << "}\n";
+
+    std::ofstream ofs ("test.txt", std::ofstream::out);
+    ofs << "{\n";
+    ofs << "  \"cookie\": \"" CMT_COOKIE "\",\n";
+    ofs << "}\n";
 }
diff --git a/test/extension-tests/successful-build/test/debugger.test.ts b/test/extension-tests/successful-build/test/debugger.test.ts
@@ -115,4 +115,32 @@ suite('[Debug/Lauch interface]', async () => {
     // Check that it is compiled as a new file
     expect(fs.existsSync(validPath)).to.be.false;
   }).timeout(60000);
-});
+
+  test('Test launch target', async () => {
+    testEnv.config.updatePartial({buildBeforeRun: false});
+
+    const executablesTargets = await cmt.executableTargets;
+    expect(executablesTargets.length).to.be.not.eq(0);
+    await cmt.setLaunchTargetByName(executablesTargets[0].name);
+
+    const launchProgrammPath = await cmt.launchTargetPath();
+    expect(launchProgrammPath).to.be.not.null;
+
+    // Remove file if not exists
+    const createdFileOnExecution = path.join(testEnv.projectFolder.location, 'test.txt');
+    if (fs.existsSync(createdFileOnExecution)) {
+      fs.unlinkSync(createdFileOnExecution);
+    }
+
+    const terminal = await cmt.launchTarget();
+    expect(terminal).of.be.not.null;
+    expect(terminal!.name).of.be.eq('CMake/Launch');
+
+    // Needed to get launch target result
+    await new Promise(res => setTimeout(res, 3000));
+
+    // Check that it is compiled as a new file
+    expect(fs.existsSync(createdFileOnExecution)).to.be.true;
+  }).timeout(60000);
+});
+