@iamsergio/qttest-utils 2.1.0 → 2.1.1

package/CONTRIBUTING.md

@@ -29,6 +29,6 @@ cargo install git-cliff
 - Get a version compatible with semver, run ` git cliff --bump | head -n 5`, replace NEW_VERSION
 - export NEW_VERSION=v1.0.0
 - Make sure Github Actions CI is green
-- npm version $NEW_VERSION
+- npm version $NEW_VERSION # ignore the error
 - git cliff --tag $NEW_VERSION > Changelog
 - git add Changelog package.json package-lock.json && git commit -m "chore: bump version" && git tag -a ${NEW_VERSION} -m "${NEW_VERSION}" && git push && git push --tags && npm publish

package/Changelog

@@ -2,6 +2,16 @@
 
 
 
+## [2.1.1] - 2024-04-25
+
+### 🐛 Bug Fixes
+
+- Allow for backslashes in the cmake codemodel
+
+### ⚙️ Miscellaneous Tasks
+
+- Improve CONTRIBUTING.md
+
 ## [2.1.0] - 2024-04-25
 
 ### 🚀 Features
@@ -18,6 +28,7 @@
 - Update CONTRIBUTING.md file
 - Fix build on macOS
 - Improve CONTRIBUTING.md
+- Bump version
 
 ## [2.0.0] - 2024-04-24
 

package/out/cmake.js

@@ -73,11 +73,14 @@ class CMakeTests {
         return tests;
     }
     /// Returns the cmake target name for the specified executable
+    /// codemodel should have a "projects" key at root.
     targetNameForExecutable(executable, codemodel) {
         // simplify:
         if (executable.endsWith(".exe")) {
             executable = executable.substring(0, executable.length - 4);
         }
+        // replace backslashes with forward slashes
+        executable = executable.replace(/\\/g, "/");
         let projects = codemodel["projects"];
         if (!projects)
             return undefined;
@@ -93,6 +96,8 @@ class CMakeTests {
                     if (artifact.endsWith(".exe")) {
                         artifact = artifact.substring(0, artifact.length - 4);
                     }
+                    // replace backslashes with forward slashes
+                    artifact = artifact.replace(/\\/g, "/");
                     if (artifact == executable) {
                         let name = target["name"];
                         if (name) {
@@ -105,13 +110,16 @@ class CMakeTests {
         }
         return undefined;
     }
-    // Returns the list of .cpp files for the specified executable
-    // codemodel is the CMake codemodel JSON object
+    /// Returns the list of .cpp files for the specified executable
+    /// codemodel is the CMake codemodel JSON object
+    /// codemodel should have a "projects" key at root.
     cppFilesForExecutable(executable, codemodel) {
         // simplify:
         if (executable.endsWith(".exe")) {
             executable = executable.substring(0, executable.length - 4);
         }
+        // replace backslashes with forward slashes
+        executable = executable.replace(/\\/g, "/");
         let projects = codemodel["projects"];
         if (!projects)
             return [];
@@ -131,6 +139,8 @@ class CMakeTests {
                     if (artifact.endsWith(".exe")) {
                         artifact = artifact.substring(0, artifact.length - 4);
                     }
+                    // replace backslashes with forward slashes
+                    artifact = artifact.replace(/\\/g, "/");
                     if (artifact == executable) {
                         let fileGroups = target["fileGroups"];
                         if (!fileGroups)

package/out/test.js

@@ -132,6 +132,17 @@ function runCodeModelTests(codeModelFile) {
             console.error("Expected test1, got " + targetName);
             process.exit(1);
         }
+        // test windows back slashes:
+        files = cmake.cppFilesForExecutable("/vscode-qttest/test/qt_test/build-dev/test2", codemodelJson);
+        if (files.length != 1) {
+            console.error("Expected 1 file, got " + files.length);
+            process.exit(1);
+        }
+        targetName = cmake.targetNameForExecutable("/vscode-qttest/test/qt_test/build-dev/test2", codemodelJson);
+        if (targetName != "test2") {
+            console.error("Expected test2, got " + targetName);
+            process.exit(1);
+        }
     });
 }
 runTests("test/qt_test/build-dev/");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iamsergio/qttest-utils",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "API for listing QtTest executables from a build directory and which individual test slots each executable contains. Useful for a Text Explorer VSCode extension.",
   "repository": {
     "type": "git",