feat: Allow the caller to pass a output callback

The caller can now get the QtTest executable output when running it
KDAB · Apr 24, 2024 · ec7f597 · ec7f597
1 parent 09bc85c
commit ec7f597
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/out/qttest.d.ts b/out/qttest.d.ts
@@ -30,7 +30,7 @@ export declare class QtTest {
     linksToQtTestLib(): Promise<boolean> | undefined;
     isQtTestViaHelp(): Promise<boolean | undefined>;
     slotByName(name: string): QtTestSlot | undefined;
-    runTest(slot?: QtTestSlot, cwd?: string): Promise<boolean>;
+    runTest(slot?: QtTestSlot, cwd?: string, outputFunc?: LoggerFunction | undefined): Promise<boolean>;
     tapOutputFileName(slot?: QtTestSlot): string;
     txtOutputFileName(slot?: QtTestSlot): string;
     command(): {

diff --git a/out/qttest.js b/out/qttest.js
@@ -201,7 +201,7 @@ class QtTest {
         return undefined;
     }
     /// Runs this test
-    runTest(slot, cwd = "") {
+    runTest(slot, cwd = "", outputFunc = undefined) {
         return __awaiter(this, void 0, void 0, function* () {
             let args = [];
             if (slot) {
@@ -219,6 +219,15 @@ class QtTest {
                 let cwdDir = cwd.length > 0 ? cwd : this.buildDirPath;
                 logMessage("Running " + this.filename + " " + args.join(" ") + " with cwd=" + cwdDir);
                 const child = (0, child_process_1.spawn)(this.filename, args, { cwd: cwdDir });
+                if (outputFunc) {
+                    // Callers wants the process output:
+                    child.stdout.on("data", (chunk) => {
+                        outputFunc(chunk.toString());
+                    });
+                    child.stderr.on("data", (chunk) => {
+                        outputFunc(chunk.toString());
+                    });
+                }
                 child.on("exit", (code) => __awaiter(this, void 0, void 0, function* () {
                     /// Can code even be null ?
                     if (code == undefined)

diff --git a/src/qttest.ts b/src/qttest.ts
@@ -197,7 +197,7 @@ export class QtTest {
     }
 
     /// Runs this test
-    public async runTest(slot?: QtTestSlot, cwd: string = ""): Promise<boolean> {
+    public async runTest(slot?: QtTestSlot, cwd: string = "", outputFunc: LoggerFunction | undefined = undefined): Promise<boolean> {
         let args: string[] = [];
         if (slot) {
             // Runs a single Qt test instead
@@ -216,6 +216,17 @@ export class QtTest {
             logMessage("Running " + this.filename + " " + args.join(" ") + " with cwd=" + cwdDir);
             const child = spawn(this.filename, args, { cwd: cwdDir });
 
+            if (outputFunc) {
+                // Callers wants the process output:
+                child.stdout.on("data", (chunk) => {
+                    outputFunc(chunk.toString());
+                });
+
+                child.stderr.on("data", (chunk) => {
+                    outputFunc(chunk.toString());
+                });
+            }
+
             child.on("exit", async (code) => {
                 /// Can code even be null ?
                 if (code == undefined) code = -1;