From e3fd3be52ba30d027b6802cf4d8b70fde0642670 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Tue, 23 Apr 2024 00:48:43 +0100 Subject: [PATCH] test: fix test on windows --- out/qttest.d.ts | 1 + out/qttest.js | 7 +++++++ out/test.js | 2 +- src/qttest.ts | 9 +++++++++ src/test.ts | 2 +- 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/out/qttest.d.ts b/out/qttest.d.ts index 3d358de..11a5445 100644 --- a/out/qttest.d.ts +++ b/out/qttest.d.ts @@ -15,6 +15,7 @@ export declare class QtTest { get id(): string; get label(): string; relativeFilename(): string; + filenameWithoutExtension(): string; /** * Calls "./yourqttest -functions" and stores the results in the slots property. */ diff --git a/out/qttest.js b/out/qttest.js index ba52502..658c151 100644 --- a/out/qttest.js +++ b/out/qttest.js @@ -80,6 +80,13 @@ class QtTest { result = result.replace(/\\/g, "/"); return result; } + /// returns filename without .exe extension + filenameWithoutExtension() { + let result = this.filename; + if (result.endsWith(".exe")) + result = result.slice(0, -4); + return result; + } /** * Calls "./yourqttest -functions" and stores the results in the slots property. */ diff --git a/out/test.js b/out/test.js index 0a5399e..11e2a80 100644 --- a/out/test.js +++ b/out/test.js @@ -98,7 +98,7 @@ function runTests(buildDirPath) { console.error("Expected 1 executable, got " + executables.length); process.exit(1); } - if (!executables[0].filename.endsWith("test1")) { + if (!executables[0].filenameWithoutExtension().endsWith("test1")) { console.error("Expected filename to end with test1"); process.exit(1); } diff --git a/src/qttest.ts b/src/qttest.ts index 7a2386e..0b96f01 100644 --- a/src/qttest.ts +++ b/src/qttest.ts @@ -63,6 +63,15 @@ export class QtTest { return result; } + /// returns filename without .exe extension + public filenameWithoutExtension() { + let result = this.filename; + if (result.endsWith(".exe")) + result = result.slice(0, -4); + + return result; + } + /** * Calls "./yourqttest -functions" and stores the results in the slots property. */ diff --git a/src/test.ts b/src/test.ts index 39fcbdd..acb13a6 100644 --- a/src/test.ts +++ b/src/test.ts @@ -106,7 +106,7 @@ async function runTests(buildDirPath: string) { process.exit(1); } - if (!executables[0].filename.endsWith("test1")) { + if (!executables[0].filenameWithoutExtension().endsWith("test1")) { console.error("Expected filename to end with test1"); process.exit(1); }