From: Francois Gouget Subject: [Tools 1/3] testbot/TestLauncher: Fix the 'missing dll' messages. Message-Id: Date: Wed, 21 Jun 2017 16:26:51 +0200 (CEST) The messages issued when skipping a test due to a missing dll must match those issued by WineTest. Signed-off-by: Francois Gouget --- testbot/src/TestLauncher/TestLauncher.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 1d0abac7..9a7dce22 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -26,7 +26,6 @@ static unsigned Failures = 0; static unsigned Skips = 0; -static char TestName[_MAX_PATH]; #define ReportError (_SetErrorLocation(__FILE__, __LINE__), 0) ? (void)0 : _ReportError @@ -91,7 +90,7 @@ static BOOL DllPresent(const char *DllName) * So instead we just dive into the executable's import table, determine which modules are being * imported and check if they are present. */ -static BOOL AllImportedDllsPresent(const char *TestExeName) +static BOOL AllImportedDllsPresent(const char *TestExeName, const char *Subtest) { HANDLE TestExe; IMAGE_DOS_HEADER DosHeader; @@ -259,7 +258,7 @@ static BOOL AllImportedDllsPresent(const char *TestExeName) { if (AllPresent) { - printf("%s:0 Test skipped: required DLL %s", TestName, ModuleName); + printf("%s.c:0: Tests skipped: required DLL %s", Subtest, ModuleName); AllPresent = FALSE; } else @@ -288,6 +287,7 @@ int main(int argc, char *argv[]) char TestExeFullName[_MAX_PATH]; char *TestExeFileName; const char *Suffix; + char TestName[_MAX_PATH]; const char *Subtest; int TestArg; char *CommandLine; @@ -378,9 +378,9 @@ int main(int argc, char *argv[]) Start = GetTickCount(); printf("%s:%s start - -\n", TestName, Subtest); - if (! AllImportedDllsPresent(TestExeFullName)) + if (! AllImportedDllsPresent(TestExeFullName, Subtest)) { - printf("%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", TestName, Failures, Failures, Skips); + printf("%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", Subtest, Failures, Failures, Skips); printf("%s:%s done (%u) in %lds\n", TestName, Subtest, Failures, (GetTickCount() - Start) / 1000); exit(0); -- 2.11.0