February 2021 - Wine-Commits

Zebediah Figura : winegstreamer: Introduce an intermediate media format structure.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: fb096d54a82a0ce754b14de3ea099a3bc0c26115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb096d54a82a0ce754b14de3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 8 15:06:59 2021 -0600 winegstreamer: Introduce an intermediate media format structure. The fundamental idea here is to provide a type which can be used in the unixlib interface. Obviously GstCaps can't be used from PE, and while AM_MEDIA_TYPE can in theory be used from the Unix library, allocation of the format block makes things a little tricky. Moreover, we'd ideally like to use the same backend for DirectShow and Media Foundation, and while it wouldn't be a problem currently, in general AM_MEDIA_TYPE is not quite expressive enough to translate from GstCaps to IMFMediaType, and the latter can't be used from the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 60 +++++ dlls/winegstreamer/gstdemux.c | 516 ++++++++++++++++++++++++++++++++------- 2 files changed, 486 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fb096d54a82a0ce754b1…

1 0

Zebediah Figura : winegstreamer: Do not use gst_segment_to_running_time().
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: a3e7cfd4d7df756145145e7c853a2f2a7a711102 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3e7cfd4d7df756145145e7c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 8 15:06:58 2021 -0600 winegstreamer: Do not use gst_segment_to_running_time(). It fails if samples lie outside of the current segment, but DirectShow filters (in particular, the native AVI splitter) will happily set timestamps outside of the current segment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7b3a4fd48bd..c05b1e24018 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -103,7 +103,6 @@ struct wg_parser_stream { GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; - GstSegment *segment; GstCaps *caps; pthread_cond_t event_cond, event_empty_cond; @@ -769,8 +768,6 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) break; } - gst_segment_copy_into(segment, stream->segment); - stream_event.type = WG_PARSER_EVENT_SEGMENT; stream_event.u.segment.position = segment->position / 100; stream_event.u.segment.stop = segment->stop / 100; @@ -822,7 +819,6 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) break; case GST_EVENT_FLUSH_STOP: - gst_segment_init(stream->segment, GST_FORMAT_TIME); if (stream->enabled) { pthread_mutex_lock(&parser->mutex); @@ -928,7 +924,6 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, GstBuffer *buf, GstMapInfo *info, gsize offset, gsize size, DWORD bytes_per_second) { - struct wg_parser_stream *stream = pin->wg_stream; HRESULT hr; BYTE *ptr = NULL; @@ -943,26 +938,19 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, memcpy(ptr, &info->data[offset], size); if (GST_BUFFER_PTS_IS_VALID(buf)) { - REFERENCE_TIME rtStart; - GstClockTime ptsStart = buf->pts; + REFERENCE_TIME rtStart, ptsStart = buf->pts; + if (offset > 0) ptsStart = buf->pts + gst_util_uint64_scale(offset, GST_SECOND, bytes_per_second); - rtStart = gst_segment_to_running_time(stream->segment, GST_FORMAT_TIME, ptsStart); - if (rtStart >= 0) - rtStart /= 100; + rtStart = ((ptsStart / 100) - pin->seek.llCurrent) * pin->seek.dRate; if (GST_BUFFER_DURATION_IS_VALID(buf)) { - REFERENCE_TIME rtStop; - REFERENCE_TIME tStart; - REFERENCE_TIME tStop; - GstClockTime ptsStop = buf->pts + buf->duration; + REFERENCE_TIME rtStop, tStart, tStop, ptsStop = buf->pts + buf->duration; if (offset + size < info->size) ptsStop = buf->pts + gst_util_uint64_scale(offset + size, GST_SECOND, bytes_per_second); tStart = ptsStart / 100; tStop = ptsStop / 100; - rtStop = gst_segment_to_running_time(stream->segment, GST_FORMAT_TIME, ptsStop); - if (rtStop >= 0) - rtStop /= 100; + rtStop = ((ptsStop / 100) - pin->seek.llCurrent) * pin->seek.dRate; TRACE("Current time on %p: %i to %i ms\n", pin, (int)(rtStart / 10000), (int)(rtStop / 10000)); IMediaSample_SetTime(sample, &rtStart, rtStop >= 0 ? &rtStop : NULL); IMediaSample_SetMediaTime(sample, &tStart, &tStop); @@ -2473,7 +2461,6 @@ static void free_stream(struct wg_parser_stream *stream) gst_object_unref(stream->their_src); } gst_object_unref(stream->my_sink); - gst_segment_free(stream->segment); pthread_cond_destroy(&stream->event_cond); pthread_cond_destroy(&stream->event_empty_cond); @@ -2538,8 +2525,6 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name pin->wg_stream = stream; strmbase_source_init(&pin->pin, &filter->filter, name, &source_ops); - stream->segment = gst_segment_new(); - gst_segment_init(stream->segment, GST_FORMAT_TIME); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate);

1 0

Zebediah Figura : winegstreamer: Store the preferred stream format as a wg_format structure.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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

Zebediah Figura : winegstreamer: Use struct wg_format to convert from AM_MEDIA_TYPE to GstCaps.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

Module: wine Branch: master Commit: 7fa0855fa12bd962d5decf59995fcb4485bd54a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fa0855fa12bd962d5decf59… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 8 15:07:00 2021 -0600 winegstreamer: Use struct wg_format to convert from AM_MEDIA_TYPE to GstCaps. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 222 +++++++++++++++++++++++++++++++----------- 1 file changed, 167 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7fa0855fa12bd962d5de…

1 0

Francois Gouget : testbot/reporttest: Fix the diacritic test.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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: Fix the test stubs.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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: Add TestWTBS information.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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: Use stubs instead of hand-coding successful tests.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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 Feb. 9, 2021

Feb. 9, 2021

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

Francois Gouget : testbot: Increase the full test suite timeout to 45 minutes.
by Alexandre Julliard Feb. 9, 2021

Feb. 9, 2021

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