February 2021 - Wine-commits

Zebediah Figura : winegstreamer: Store the preferred stream format as a wg_format structure.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 5a3dad108bfad870ba9ea03bf042de993b0b5a8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a3dad108bfad870ba9ea03b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 8 15:07:01 2021 -0600 winegstreamer: Store the preferred stream format as a wg_format structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 229 ++++++------------------------------------ 1 file changed, 32 insertions(+), 197 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a3dad108bfad870ba9e…

1 0

Esme Povirk : mscoree: Update Wine Mono to 6.0.0.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: cae84e2b06fca691e3572d68a933a98b94962e16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cae84e2b06fca691e3572d68… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Feb 8 15:13:32 2021 -0600 mscoree: Update Wine Mono to 6.0.0. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- dlls/mscoree/tests/comtest.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index cfc51155f57..b2e726422da 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "5.1.1" +#define MONO_VERSION "6.0.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "74541265b9385842bc22bba2bb4b90bf1d3fd8b4788b6676140700bebacb9227" +#define MONO_SHA "5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index c9edc2d68d0..da587285cfe 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "5.1.1" +#define WINE_MONO_VERSION "6.0.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 4b2183bac3a..6c0d081cbd3 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -195,7 +195,7 @@ static void run_registry_test(run_type run) ok(hr == S_OK, "Got %x\n", hr); ok(i == 42, "Expected 42, got %d\n", i); hr = ITest_QueryInterface(test, &IID_ITest2, (void**)&unk); - todo_wine ok(hr == S_OK, "ITest_QueryInterface returned %x\n", hr); + ok(hr == S_OK, "ITest_QueryInterface returned %x\n", hr); if (hr == S_OK) IUnknown_Release(unk); ITest_Release(test); }

1 0

Hans Leidekker : wbemprox: Implement Win32_LogicalDisk.Caption.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 14905720edf61dd16e9a09ff0bf8612775ba8cf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14905720edf61dd16e9a09ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 9 10:12:54 2021 +0100 wbemprox: Implement Win32_LogicalDisk.Caption. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50643 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b86326327fb..498e3f6fc79 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -177,6 +177,7 @@ static const struct column col_ip4routetable[] = }; static const struct column col_logicaldisk[] = { + { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { L"DriveType", CIM_UINT32 }, { L"FileSystem", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -585,6 +586,7 @@ struct record_ip4routetable }; struct record_logicaldisk { + const WCHAR *caption; const WCHAR *device_id; UINT32 drivetype; const WCHAR *filesystem; @@ -2501,6 +2503,7 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr rec = (struct record_logicaldisk *)(table->data + offset); swprintf( device_id, ARRAY_SIZE( device_id ), L"%c:", 'A' + i ); + rec->caption = heap_strdupW( device_id ); rec->device_id = heap_strdupW( device_id ); rec->drivetype = type; rec->filesystem = get_filesystem( root ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a0488f40e52..b5de00b5dec 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1905,6 +1905,33 @@ static void test_SystemRestore( IWbemServices *services ) SysFreeString( class ); } +static void test_Win32_LogicalDisk( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ); + BSTR query = SysAllocString( L"SELECT * FROM Win32_LogicalDisk" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1955,6 +1982,7 @@ START_TEST(query) test_Win32_DiskDrive( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); + test_Win32_LogicalDisk( services ); test_Win32_NetworkAdapter( services ); test_Win32_NetworkAdapterConfiguration( services ); test_Win32_OperatingSystem( services );

1 0

Rémi Bernon : server: Grow rawinput buffer instead of allocating its maximum size.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: wine Branch: master Commit: 50798b1320b24e7c74d350853a895b16881c376d URL: https://source.winehq.org/git/wine.git/?a=commit;h=50798b1320b24e7c74d35085… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 8 12:09:43 2021 +0100 server: Grow rawinput buffer instead of allocating its maximum size. Call of Duty: WWII call GetRawInputBuffer with very large client buffer, so the maximum buffer size may be large and it causes an unnecessary load on wineserver when it allocates and clears the reply buffer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/server/queue.c b/server/queue.c index ad886a3ba80..e47980a4aa8 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3256,12 +3256,11 @@ DECL_HANDLER(get_rawinput_buffer) struct thread_input *input = current->queue->input; data_size_t size = 0, next_size = 0; struct list *ptr; - char *buf, *cur; - int count = 0; + char *buf, *cur, *tmp; + int count = 0, buf_size = 16 * sizeof(struct hardware_msg_data); if (!req->buffer_size) buf = NULL; - else if (!(buf = mem_alloc( get_reply_max_size() ))) - return; + else if (!(buf = mem_alloc( buf_size ))) return; cur = buf; ptr = list_head( &input->msg_list ); @@ -3276,6 +3275,17 @@ DECL_HANDLER(get_rawinput_buffer) next_size = req->rawinput_size; if (size + next_size > req->buffer_size) break; if (cur + sizeof(*data) > buf + get_reply_max_size()) break; + if (cur + sizeof(*data) > buf + buf_size) + { + buf_size += buf_size / 2; + if (!(tmp = realloc( buf, buf_size ))) + { + set_error( STATUS_NO_MEMORY ); + return; + } + cur = tmp + (cur - buf); + buf = tmp; + } memcpy(cur, data, sizeof(*data)); list_remove( &msg->entry );

1 0

Francois Gouget : testbot: Increase the full test suite timeout to 45 minutes.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: tools Branch: master Commit: 55869ec46bada7385e4b1adc856332bb23abda18 URL: https://source.winehq.org/git/tools.git/?a=commit;h=55869ec46bada7385e4b1ad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 8 22:07:07 2021 +0100 testbot: Increase the full test suite timeout to 45 minutes. 30 minutes is really too short to run the 700+ tests nowadays. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 2f01e95..3127972 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -130,7 +130,7 @@ $TimeoutMargin = 2 * 60; # Test timeouts (in seconds) # - For the whole test suite -$SuiteTimeout = 30 * 60; +$SuiteTimeout = 45 * 60; # - For the first two tests $SingleTimeout = 2 * 60; # - For extra tests

1 0

Francois Gouget : testbot/reporttest: Fix the diacritic test.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: tools Branch: master Commit: 7f037fdb1e18b46298c32cc725cd2930f4444fce URL: https://source.winehq.org/git/tools.git/?a=commit;h=7f037fdb1e18b46298c32cc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 9 02:12:47 2021 +0100 testbot/reporttest: Fix the diacritic test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 8da3d82..560c8b2 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -226,7 +226,7 @@ advapi32:crypt_lmhash start dlls/advapi32/tests/crypt_lmhash.c - ----- A test unit with two failed tests ----- Expected assessement: 2 failures despite exit code crypt_lmhash.c:10: Test failed: Something wrong -crypt_lmhash.c:20: Test failed: Second failure with added diacritics: ?????????? +crypt_lmhash.c:20: Test failed: Second failure with added diacritics: àéïôÿ 07c0:crypt_lmhash: 95 tests executed (0 marked as todo, 2 failures), 0 skipped. advapi32:crypt_lmhash:07c0 done (1) in 0s

1 0

Francois Gouget : testbot/reporttest: Add TestWTBS information.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: tools Branch: master Commit: 109ed1a6c67d2a0eeb0badb01820807578037bed URL: https://source.winehq.org/git/tools.git/?a=commit;h=109ed1a6c67d2a0eeb0badb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 9 02:27:35 2021 +0100 testbot/reporttest: Add TestWTBS information. Embed TestWTBS directives and add a --testwtbs option to output the directives instead of the regular report. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/Makefile | 2 +- testbot/src/reporttest/report.testwtbs | 70 ++++++++++++++++++++++++++++++++++ testbot/src/reporttest/reporttest.c | 18 +++++++-- testbot/src/reporttest/reporttest.rc | 1 + 4 files changed, 87 insertions(+), 4 deletions(-) diff --git a/testbot/src/reporttest/Makefile b/testbot/src/reporttest/Makefile index f8a927d..152b987 100644 --- a/testbot/src/reporttest/Makefile +++ b/testbot/src/reporttest/Makefile @@ -21,7 +21,7 @@ ReportTest.exe: reporttest.obj reporttest.res .rc.res: $(CROSSWINDRES) -O coff -o $@ $< -reporttest.res: report.template +reporttest.res: report.template report.testwtbs clean: rm -f *.obj *.res diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs new file mode 100644 index 0000000..49ef2c0 --- /dev/null +++ b/testbot/src/reporttest/report.testwtbs @@ -0,0 +1,70 @@ +The directives below allow checking the results of a ReportTest.exe +TestBot run using TestWTBS. To do so use a command of the form: + + tests/TestWTBS --jobs ID --job-wtbs ID src/reporttest/report.testwtbs + +Where ID is the identifier of the ReportTest.exe job. +See the TestWTBS usage for more information about TestWTBS. + +As an alternative, if the ReportTest source is not available, extract this file +with: + + ReportTest.exe -T >report.testwtbs + + +----- TestWTBS ----- +p tests.TestFailures 40 + +p build.HasTask 0 +a wine.log.GrepV ^Applying patch +a wine.log.GrepV ^Rebuilding the + +g 0 tests.report.advapi32 +n 0 crypt.c:1: Test failed: Something wrong +n 0 crypt_lmhash.c:10: Test failed: Something wrong +n 0 crypt_lmhash.c:20: Test failed: Second failure with added diacritics: àéïôÿ +n 0 crypt_md5.c:20: Test failed: A failure here, presumably in the subprocess +n 0 crypt_sha.c:20: Test failed: A failure here, presumably in the subprocess +n 0 eventlog.c:20: Test failed: Something wrong +n 0 service.c:20: Test failed: A failure in the subprocess + +g 0 tests.report.advpack +n 0 files.c:20: Test failed: A failure in the main process +n 0 07b0:install: unhandled exception c0000005 at 0040167C + +g 0 tests.report.comctl32 +n 0 animate: Timeout +n 0 comboex.c:40: Test failed: A failure in the main process +n 0 comboex.c:41: Test succeeded inside todo block: Success in the main process +n 0 header.c:1: Test failed: Something wrong +n 0 1234:rebar: unhandled exception c0000005 at 0040167C +n 0 1234:subclass: unhandled exception c0000005 at 0040167C +n 0 Do not cut syslink.c:40: Test failed: Something wrong +n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right! +n 0 driver.c:40: Test failed: Something wrong +n 0 driver.c:41: Test succeeded inside todo block: Something right! + +g 0 tests.report.xmllite +n 0 writer.c:20: Test failed: A delayed failure, typically in a subprocess + +g 0 tests.report.Report validation errors +n 0 advapi32:eventlog has unaccounted for failure messages +n 0 advapi32:lsa has no test summary line (early exit of the main process?) +n 0 advapi32:registry has no test summary line (early exit of the main process?) +n 0 advapi32:service returned success despite having failures +n 0 atl:registrar contains a misplaced test summary message for alien +n 0 browseui:progressdlg has unaccounted for skip messages +n 0 cabinet:extract is missing some skip messages +n 0 cmd.exe:batch has unaccounted for todo messages +n 0 comcat:comcat is missing some todo messages +n 0 comctl32:datetime is missing some failure messages +n 0 comctl32:dpa returned a non-zero exit code despite reporting no failures +n 0 comctl32:header returned success despite having failures +n 0 comctl32:ipaddress has no done line (or it is garbled) +n 0 comctl32:misc had no start line (or it is garbled) +n 0 comctl32:monthcal contains a misplaced todo message for security +n 0 comctl32:rebar returned success despite having failures +n 0 comctl32:toolbar has no done line (or it is garbled) +n 0 xmllite:writer has unaccounted for failure messages +n 0 xmllite:writer returned success despite having failures +----- TestWTBS ----- diff --git a/testbot/src/reporttest/reporttest.c b/testbot/src/reporttest/reporttest.c index e1a8a3d..d2364c9 100644 --- a/testbot/src/reporttest/reporttest.c +++ b/testbot/src/reporttest/reporttest.c @@ -44,6 +44,7 @@ static void usage(void) "\n" " -C COMMITID Reports the results for this Git commit id.\n" " -t TAG Reports the results for this tag.\n" + " -T Output the TestWTBS directives instead of the standard report.\n" " --help Print this message and exit.\n" "Other WineTest options are either ignored or not supported.\n" ); @@ -52,6 +53,7 @@ static void usage(void) int main(int argc, char** argv) { char *commitid = NULL, *email = NULL, *logname = NULL, *tag = NULL; + int testwtbs = 0; int i; FILE *logfile; char *report, *eol; @@ -156,6 +158,9 @@ int main(int argc, char** argv) return 2; } break; + case 'T': + testwtbs = 1; + break; case 'x': /* Nothing to do */ return 0; @@ -170,16 +175,16 @@ int main(int argc, char** argv) } } - report = extract_rcdata("TESTREPORT", "TESTRES", &size); + report = extract_rcdata(testwtbs ? "TESTWTBS" : "TESTREPORT", "TESTRES", &size); if (!report) { - fprintf(stderr, "error: Could not extract the test report (%lu)\n", GetLastError()); + fprintf(stderr, "error: Could not extract the %s (%lu)\n", testwtbs ? "TestWTBS directives" : "test report", GetLastError()); return 1; } if (logname) { - logfile = fopen(logname, "w"); + logfile = fopen(logname, testwtbs ? "wb" : "w"); if (!logfile) { fprintf(stderr, "error: Could not open '%s' for writing the test: %s\n", logname, strerror(errno)); @@ -211,6 +216,13 @@ int main(int argc, char** argv) line[eol-report] = '\0'; report = eol; + if (testwtbs) + { + /* The TestWTBS directives do not require any processing */ + fputs(line, logfile); + continue; + } + /* Empty lines are only there to make the report more editable */ if (*line == '\n') continue; diff --git a/testbot/src/reporttest/reporttest.rc b/testbot/src/reporttest/reporttest.rc index 7dd0fc8..c252250 100644 --- a/testbot/src/reporttest/reporttest.rc +++ b/testbot/src/reporttest/reporttest.rc @@ -1 +1,2 @@ TESTREPORT TESTRES "report.template" +TESTWTBS TESTRES "report.testwtbs"

1 0

Francois Gouget : testbot/reporttest: Fix the test stubs.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: tools Branch: master Commit: 669d6beb14fb655a483a18bba7078c9778aac753 URL: https://source.winehq.org/git/tools.git/?a=commit;h=669d6beb14fb655a483a18b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 9 03:14:22 2021 +0100 testbot/reporttest: Fix the test stubs. Fix the generated source file path and automatically select the dlls or programs root directory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 1 + testbot/src/reporttest/reporttest.c | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 560c8b2..dc4b397 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -210,6 +210,7 @@ Dll info: Test output: stub advapi32:cred ----- WTBS Simple test patch +----- Stubs automatically generate a successful dlls or programs test. ----- Expected assessement: Success advapi32:crypt start dlls/advapi32/tests/crypt.c - diff --git a/testbot/src/reporttest/reporttest.c b/testbot/src/reporttest/reporttest.c index d2364c9..67dca24 100644 --- a/testbot/src/reporttest/reporttest.c +++ b/testbot/src/reporttest/reporttest.c @@ -240,6 +240,9 @@ int main(int argc, char** argv) } else if (strncmp(line, "stub ", 5) == 0) { + char* root; + char* module = line + 5; + int dirlen; char* unit = strchr(line, ':'); if (!unit) { @@ -249,12 +252,22 @@ int main(int argc, char** argv) } *unit = '\0'; unit++; - unit[strlen(unit)-1] = '\0'; - fprintf(logfile, "%s:%s start fake/%s/%s.c -\n", line+5, unit, line+5, unit); + unit[strlen(unit)-1] = '\0'; /* strip the \r */ + + dirlen = strlen(module); + if (strstr(module, ".exe")) + { + dirlen -= 4; + root = "programs"; + } + else + root = strstr(module, ".com") ? "programs" : "dlls"; + + fprintf(logfile, "%s:%s start %s/%.*s/tests/%s.c -\n", module, unit, root, dirlen, module, unit); fprintf(logfile, "----- A standard successful test unit\n"); fprintf(logfile, "----- Expected assessment: Success\n"); fprintf(logfile, "1234:%s: 2 tests executed (0 marked as todo, 0 failures), 0 skipped.\n", unit); - fprintf(logfile, "%s:%s:1234 done (0) in 0s\n", line+5, unit); + fprintf(logfile, "%s:%s:1234 done (0) in 0s\n", module, unit); } else {

1 0

Francois Gouget : testbot/reporttest: Use stubs instead of hand-coding successful tests.
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: tools Branch: master Commit: f44ba31be4baf352349e7ed2be01d378b2069e5d URL: https://source.winehq.org/git/tools.git/?a=commit;h=f44ba31be4baf352349e7ed… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 9 03:14:25 2021 +0100 testbot/reporttest: Use stubs instead of hand-coding successful tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index dc4b397..14d2cf6 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -301,11 +301,8 @@ advapi32:service:037c done (0) in 11s service.c:20: Test failed: A failure in the subprocess 4567:service: 10 tests executed (0 marked as todo, 1 failure), 0 skipped. -advpack:advpack start dlls/advpack/tests/advpack.c - ------ A standard successful test unit ------ Expected assessement: Success, unless the previous test interferes -0da0:advpack: 99 tests executed (0 marked as todo, 0 failures), 0 skipped. -advpack:advpack:0da0 done (0) in 0s +----- Keep this stub in case the previous test is mishandled +stub advpack:advpack advpack:files start dlls/advpack/tests/files.c - ----- A test unit with a failed test in the main process before a subprocess @@ -458,11 +455,8 @@ comctl32:monthcal:0148 done (0) in 9s security.c:41: Test marked todo: Hello Wine! 0955:security: 18 tests executed (1 marked as todo, 0 failures), 0 skipped. -comctl32:mru start dlls/comctl32/tests/mru.c - ------ A standard successful test unit ------ Expected assessement: Success, unless the previous test interferes -0148:mru: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. -comctl32:mru:0148 done (0) in 9s +----- Keep this stub in case the previous test is mishandled +stub comctl32:mru comctl32:pager start dlls/comctl32/tests/pager.c - ----- A test unit with a misplaced subprocess skip test summary line @@ -473,11 +467,8 @@ comctl32:pager:0148 done (0) in 9s security.c:42: Tests skipped: Another time 0956:security: 18 tests executed (0 marked as todo, 0 failures), 1 skipped. -comctl32:progress start dlls/comctl32/tests/progress.c - ------ A standard successful test unit ------ Expected assessement: Success -0148:progress: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. -comctl32:progress:0148 done (0) in 9s +----- Keep this stub in case the previous test is mishandled +stub comctl32:progress stub comctl32:propsheet

1 0

Francois Gouget : testbot/TestWTBS: The prefix may be undefined in GrepFile().
by Alexandre Julliard 09 Feb '21

09 Feb '21

Module: tools Branch: master Commit: 5a31273f86942561783e900fc676c3839cc9dceb URL: https://source.winehq.org/git/tools.git/?a=commit;h=5a31273f86942561783e900… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 9 16:22:24 2021 +0100 testbot/TestWTBS: The prefix may be undefined in GrepFile(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 4837664..dbd1130 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -757,6 +757,7 @@ sub GrepFile($$$$;$) { my ($Key, $Dir, $FileName, $GrepInfo, $GrepPrefix) = @_; + $GrepPrefix ||= ""; my @Grep = @{$GrepInfo->{"${GrepPrefix}Grep"} || []}; my @GrepV = @{$GrepInfo->{"${GrepPrefix}GrepV"} || []}; return if (!@Grep and !@GrepV);

1 0