@iamsergio/qttest-utils 1.0.0 → 1.1.1

package/CONTRIBUTING.md

@@ -27,11 +27,12 @@ cargo install git-cliff
 
 (Replace 1.0.0 with actual version used)
 
+export NEW_VERSION=v1.0.0
 - Make sure Github Actions CI is green
 - Optional: To get a version compatible with semver, run `git cliff --bump`
 - Increase version in package.json and package-lock.json.
-- git cliff --tag 1.0.0 > Changelog
+- git cliff --tag $NEW_VERSION > Changelog
 - git add Changelog package.json package-lock.json && git commit -m "chore: bump version"
-- git tag -a v1.0.0 -m 'v1.0.0'
-- git push --tags
+- git tag -a ${NEW_VERSION} -m "${NEW_VERSION}"
+- git push && git push --tags
 - npm publish

package/Changelog

@@ -2,6 +2,43 @@
 
 
 
+## [1.1.1] - 2024-04-07
+
+### 🐛 Bug Fixes
+
+- Verbose logging not appearing in vscode
+
+### ⚙️ Miscellaneous Tasks
+
+- Improve CONTRIBUTING.md
+
+## [1.1.0] - 2024-04-07
+
+### 🚀 Features
+
+- Added QtTest.verbose property
+
+### 🧪 Testing
+
+- Add a QBENCHMARK
+- Fix tests on windows
+- Fix more cases of wrong slashes
+- Test linksToQtTestLib too
+
+### ⚙️ Miscellaneous Tasks
+
+- Minor readme comment
+- Update .npmignore
+- Fix typo in README
+- Fix badge urls in README
+- Mention the vscode extension in the README
+- Remove duplicate vscode workspace file
+- Add macOS and Windows to CI
+- Make npm install be verose
+- Trying fixing the path for tsc on macos
+- Update packages
+- Bump version
+
 ## [1.0.0] - 2024-04-04
 
 ### 🧪 Testing
@@ -30,6 +67,8 @@
 - Bump to version 1.0.0
 - Regenerate out/
 - Add a CONTRIBUTING.md file
+- Update changelog
+- Add ci badges to readme
 
 ## [0.4.9] - 2023-04-06
 

package/README.md

@@ -1,12 +1,14 @@
 # nodejs qttest-utils
 
-![Build Status](https://github.com/qttest-utils/actions/workflows/ci.yml/badge.svg
-![Pre-commit](https://github.com/qttest-utils/actions/workflows/pre-commit.yml/badge.svg
+![Build Status](https://github.com/KDAB/qttest-utils/actions/workflows/ci.yml/badge.svg)
+![Pre-commit](https://github.com/KDAB/qttest-utils/actions/workflows/pre-commit.yml/badge.svg)
 
 A [nodejs](https://www.npmjs.com/package/@iamsergio/qttest-utils) module for listing Qt Test executables and their individual test slots from a CMake build directory.
 
 To be used by vscode extensions that implement the `Testing API`, but can also be used standalone for whatever reason ;).
 
+Used by [vscode-qttest](https://github.com/KDAB/vscode-qttest) extension.
+
 ## Installation
 
 ```bash

package/out/qttest.d.ts

@@ -7,6 +7,7 @@ export declare function logMessage(message: string): void;
 export declare class QtTest {
     readonly filename: string;
     readonly buildDirPath: string;
+    verbose: boolean;
     vscodeTestItem: any | undefined;
     slots: QtTestSlot[] | null;
     lastExitCode: number;

package/out/qttest.js

@@ -56,6 +56,8 @@ exports.logMessage = logMessage;
  */
 class QtTest {
     constructor(filename, buildDirPath) {
+        /// If true, will print more verbose output
+        this.verbose = false;
         /// The list of individual runnable test slots
         this.slots = null;
         /// Set after running
@@ -70,8 +72,13 @@ class QtTest {
         return path_1.default.basename(this.filename);
     }
     relativeFilename() {
-        let current_dir = process.cwd();
-        return this.filename.replace(current_dir + "/", "");
+        let result = path_1.default.relative(process.cwd(), this.filename);
+        // strip .exe, as we only use this for tests
+        if (result.endsWith(".exe"))
+            result = result.slice(0, -4);
+        // normalize slashes
+        result = result.replace(/\\/g, "/");
+        return result;
     }
     /**
      * Calls "./yourqttest -functions" and stores the results in the slots property.
@@ -83,7 +90,7 @@ class QtTest {
             let err = "";
             yield new Promise((resolve, reject) => {
                 if (!fs.existsSync(this.filename)) {
-                    reject(new Error("File doesn't exit: " + this.filename));
+                    reject(new Error("qttest: File doesn't exit: " + this.filename));
                     return;
                 }
                 const child = (0, child_process_1.spawn)(this.filename, ["-functions"], { cwd: this.buildDirPath });
@@ -108,7 +115,7 @@ class QtTest {
                         resolve(slotNames);
                     }
                     else {
-                        reject(new Error("Failed to run -functions, stdout=" + output + "; stderr=" + err + "; code=" + code));
+                        reject(new Error("qttest: Failed to run -functions, stdout=" + output + "; stderr=" + err + "; code=" + code));
                     }
                 });
             });
@@ -136,13 +143,15 @@ class QtTest {
                         result = true;
                     }
                 }
+                if (this.verbose)
+                    console.log(chunk.toString());
             });
             child.on("exit", (code) => {
                 if (code === 0) {
                     resolve(result);
                 }
                 else {
-                    reject(new Error("Failed to run ldd"));
+                    reject(new Error("qttest: Failed to run ldd"));
                 }
             });
         });
@@ -183,8 +192,8 @@ class QtTest {
         return undefined;
     }
     /// Runs this test
-    runTest(slot_1) {
-        return __awaiter(this, arguments, void 0, function* (slot, cwd = "") {
+    runTest(slot, cwd = "") {
+        return __awaiter(this, void 0, void 0, function* () {
             let args = [];
             if (slot) {
                 // Runs a single Qt test instead

package/out/test.js

@@ -28,6 +28,7 @@ function runTests(buildDirPath) {
             console.error("Expected 3 executables, got " + qt.qtTestExecutables.length);
             process.exit(1);
         }
+        yield qt.removeNonLinking();
         // 1. Test that the executable test names are correct:
         var i = 0;
         for (var executable of qt.qtTestExecutables) {
@@ -70,6 +71,12 @@ function runTests(buildDirPath) {
                 console.error("Expected test to pass: " + executable.filename);
                 process.exit(1);
             }
+            if (process.platform === "linux") {
+                if (!executable.linksToQtTestLib()) {
+                    console.error("Expected test to link to QtTest: " + executable.filename);
+                    process.exit(1);
+                }
+            }
             i++;
         }
         // 4. Run individual slots:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iamsergio/qttest-utils",
-  "version": "1.0.0",
+  "version": "1.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",
@@ -21,6 +21,6 @@
   "devDependencies": {
     "@types/node": "^18.15.0",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.5"
+    "typescript": "^5.4.4"
   }
-}
+}