June 2018 - Wine-commits - list.winehq.org

Józef Kucia : tests: Add test for cube maps.
by Alexandre Julliard 27 Jun '18

27 Jun '18

Module: vkd3d Branch: master Commit: cc8c0135a17bdd28b82e8b095141b319a84a0c59 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cc8c0135a17bdd28b82e8b0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 27 15:19:23 2018 +0200 tests: Add test for cube maps. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 305 +++++++++++++++++++++++++++++++++++++++++++++++ tests/vkd3d_d3d12_test.h | 15 +-- 2 files changed, 313 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cc8c0135a17bdd28b82…

1 0

Józef Kucia : libs/vkd3d: Set names for internal threads.
by Alexandre Julliard 27 Jun '18

27 Jun '18

Module: vkd3d Branch: master Commit: 89a2dc46dd8f84fa199eebaed4e18492e4eae8ed URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=89a2dc46dd8f84fa199eeba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 27 15:19:24 2018 +0200 libs/vkd3d: Set names for internal threads. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 2 ++ libs/vkd3d/command.c | 4 ++++ libs/vkd3d/vkd3d_private.h | 8 +++++--- m4/check-functions.m4 | 7 +++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index daae646..2773a15 100644 --- a/configure.ac +++ b/configure.ac @@ -93,6 +93,8 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popco VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) +VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) + AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index ee1d3f6..d29d18e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -199,6 +199,10 @@ static void *vkd3d_fence_worker_main(void *arg) struct vkd3d_fence_worker *worker = arg; int rc; +#ifdef HAVE_PTHREAD_SETNAME_NP + pthread_setname_np(pthread_self(), "vkd3d_worker"); +#endif + for (;;) { if ((rc = pthread_mutex_lock(&worker->mutex))) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 38f0bf3..29611b8 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -19,12 +19,14 @@ #ifndef __VKD3D_PRIVATE_H #define __VKD3D_PRIVATE_H -#define VK_NO_PROTOTYPES - #define COBJMACROS #define NONAMELESSUNION -#include "vkd3d.h" +#define VK_NO_PROTOTYPES + +#include "vkd3d_common.h" #include "vkd3d_memory.h" + +#include "vkd3d.h" #include "vkd3d_shader.h" #include <assert.h> diff --git a/m4/check-functions.m4 b/m4/check-functions.m4 index 8bb8213..17082a1 100644 --- a/m4/check-functions.m4 +++ b/m4/check-functions.m4 @@ -7,3 +7,10 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([int main(void) { return [$3]; }])], [1], [Define to 1 if you have $2.])], [AC_MSG_RESULT([no])])]) + +dnl VKD3D_CHECK_LIB_FUNCS +AC_DEFUN([VKD3D_CHECK_LIB_FUNCS], +[vkd3d_libs_saved="$LIBS" +LIBS="$LIBS $2" +AC_CHECK_FUNCS([$1], [$3], [$4]) +LIBS="$vkd3d_libs_saved"])

1 0

Józef Kucia : libs/vkd3d: Trace build version.
by Alexandre Julliard 27 Jun '18

27 Jun '18

Module: vkd3d Branch: master Commit: 404e988ecd4b358f071d8dea58301ae48acfd352 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=404e988ecd4b358f071d8de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jun 27 15:19:25 2018 +0200 libs/vkd3d: Trace build version. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 11 ++++++++++- libs/.gitignore | 1 + libs/vkd3d/device.c | 2 ++ libs/vkd3d/vkd3d_private.h | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index faefc67..14f2d51 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,7 +94,8 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d.map \ libs/vkd3d/vkd3d_main.c \ libs/vkd3d/vkd3d_private.h \ - libs/vkd3d/vulkan_procs.h + libs/vkd3d/vulkan_procs.h \ + libs/vkd3d_version.c libvkd3d_la_LDFLAGS = -version-info 1:0:0 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT @@ -173,6 +174,14 @@ libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ $< > $@ +libs/vkd3d_version.c: dummy-vkd3d-version + version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "vkd3d-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char vkd3d_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) +.SILENT: libs/vkd3d_version.c +CLEANFILES += libs/vkd3d_version.c + +.PHONY: dummy-vkd3d-version +dummy-vkd3d-version: + ## Cross-compile tests cross_implibs = crosslibs/d3d12 CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include diff --git a/libs/.gitignore b/libs/.gitignore new file mode 100644 index 0000000..b4fc05a --- /dev/null +++ b/libs/.gitignore @@ -0,0 +1 @@ +vkd3d_version.c diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e4c4d52..fb57d76 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -284,6 +284,8 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, VkResult vr; HRESULT hr; + TRACE("Build: %s.\n", vkd3d_build); + if (!create_info->pfn_signal_event) { ERR("Invalid signal event function pointer.\n"); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 29611b8..6858259 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -794,4 +794,6 @@ HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs, HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, const struct vkd3d_vk_instance_procs *parent_procs, VkDevice device) DECLSPEC_HIDDEN; +extern const char vkd3d_build[]; + #endif /* __VKD3D_PRIVATE_H */

1 0

Francois Gouget : testbot/WineRunWineTest: Ignore other errors if we get a badpatch error.
by Alexandre Julliard 27 Jun '18

27 Jun '18

Module: tools Branch: master Commit: fe21cd684df78ab570bb2a59b7ed42c51fb81510 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fe21cd684df78ab570bb2a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 27 08:03:46 2018 +0200 testbot/WineRunWineTest: Ignore other errors if we get a badpatch error. Just like finding a success line in the task log proves that it was successful no matter what happened before, a 'badpatch' line conclusively determines the task status. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunWineTest.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 0aba7ec..53a2a09 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -356,8 +356,8 @@ if (!$Pid) # -# From that point on we want to at least try to grab the task -# log before giving up +# From that point on we want to at least try to grab the task log +# before giving up # my ($NewStatus, $ErrMessage, $TAError, $TaskTimedOut); @@ -391,7 +391,9 @@ if ($TA->GetFile("Task.log", "$TaskDir/log")) } elsif ($Result eq "badpatch") { + # This too is conclusive enough to ignore other errors. $NewStatus = "badpatch"; + $TAError = $ErrMessage = undef; } elsif ($Result =~ s/^nolog://) {

1 0

Francois Gouget : testbot/WineRunTask: Make the Wine report parser reusable.
by Alexandre Julliard 27 Jun '18

27 Jun '18

Module: tools Branch: master Commit: 22b0b5aa6dbc01c4ca12ed466aef53ebc8dea413 URL: https://source.winehq.org/git/tools.git/?a=commit;h=22b0b5aa6dbc01c4ca12ed4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 27 08:03:59 2018 +0200 testbot/WineRunTask: Make the Wine report parser reusable. Moving it to LogUtils.pm makes it possible to reuse it in future scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 276 ++------------------------------ testbot/lib/WineTestBot/LogUtils.pm | 310 +++++++++++++++++++++++++++++++++++- 2 files changed, 322 insertions(+), 264 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=22b0b5aa6dbc01c4ca1…

1 0

Francois Gouget : testbot: Run WineTest on Wine VMs after commits.
by Alexandre Julliard 27 Jun '18

27 Jun '18

Module: tools Branch: master Commit: 09db2bcc1b05b57583c4285803fa5c2012ddbad2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=09db2bcc1b05b57583c4285… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 27 08:05:01 2018 +0200 testbot: Run WineTest on Wine VMs after commits. WineReconfig.pl now knows how to retrieve and cache the Gecko and Mono addons, and how to create new wineprefixes. These are then captured by the updated snapshot and are thus ready to use to run tests. CheckForWinetestUpdate.pl creates additional steps to rerun the full WineTest suite on the Wine VMs if the Wine rebuild was successful. Running WineTest is handled by WineTest.pl and WineRunWineTest.pl collects the corresponding reports in the latest directory in files named '<vm>_<build>.report' where build is one of win32, wow32 or wow64. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 44 ++++++- testbot/bin/WineRunWineTest.pl | 218 +++++++++++++++++++++++++++++----- testbot/bin/build/WineReconfig.pl | 189 +++++++++++++++++++++++++++-- testbot/bin/build/WineTest.pl | 118 ++++++++++++++++-- testbot/lib/WineTestBot/LogUtils.pm | 8 +- testbot/lib/WineTestBot/Utils.pm | 19 ++- 6 files changed, 537 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=09db2bcc1b05b57583c…

1 0

Francois Gouget : testbot: Fix the detection of the start and skipped report lines.
by Alexandre Julliard 27 Jun '18

27 Jun '18

Module: tools Branch: master Commit: 5565d09526fe49ddb5922f379b2ef755d994dd63 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5565d09526fe49ddb5922f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 27 08:06:40 2018 +0200 testbot: Fix the detection of the start and skipped report lines. This now matches the Wine report parser. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 2d3042e..bccf30d 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -408,7 +408,7 @@ sub GetLogLineCategory($) return "todo"; } if ($Line =~ /: Tests skipped: / or - $Line =~ /^\w+:\w+ skipped /) + $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* skipped /) { return "skip"; } @@ -431,7 +431,7 @@ sub GetLogLineCategory($) return "error"; } if ($Line =~ /^\+ \S/ or - $Line =~ /^\w+:\w+ start / or + $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or # Build messages $Line =~ /^(?:Build|Reconfig|Task): ok/) {

1 0

Francois Gouget : testbot/web: Compile patches on wow64 if 64 bit tests have been selected.
by Alexandre Julliard 27 Jun '18

27 Jun '18

Module: tools Branch: master Commit: 1d8d8c4a2326f9da147a00d3c22bc06eb754db13 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1d8d8c4a2326f9da147a00d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 27 08:07:34 2018 +0200 testbot/web: Compile patches on wow64 if 64 bit tests have been selected. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 9fa252a..38aa75f 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -858,30 +858,35 @@ sub OnSubmit($) my $VMs = CreateVMs(); $VMs->AddFilter("Type", ["wine"]); my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) + foreach my $Build ("win32", "wow64") { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - next if (!$self->GetParam($FieldName)); # skip unselected VMs + next if ($Build eq "wow64" and !defined($self->GetParam("Run64"))); - if (!$Tasks) + foreach my $VMKey (@$SortedKeys) { - # First create the Wine test step - my $WineStep = $Steps->Add(); - $WineStep->FileName($BaseName); - $WineStep->FileType($FileType); - $WineStep->InStaging(!1); - $WineStep->Type("build"); - $WineStep->DebugLevel($self->GetParam("DebugLevel")); - $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); - $Tasks = $WineStep->Tasks; - } + my $VM = $VMs->GetItem($VMKey); + my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); + next if (!$self->GetParam($FieldName)); # skip unselected VMs - # Then add a task for this VM - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->CmdLineArg("win32"); - $Task->Timeout($WineReconfigTimeout); + if (!$Tasks) + { + # First create the Wine test step + my $WineStep = $Steps->Add(); + $WineStep->FileName($BaseName); + $WineStep->FileType($FileType); + $WineStep->InStaging(!1); + $WineStep->Type("build"); + $WineStep->DebugLevel($self->GetParam("DebugLevel")); + $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); + $Tasks = $WineStep->Tasks; + } + + # Then add a task for this VM + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->CmdLineArg($Build); + $Task->Timeout($WineReconfigTimeout); + } } }

1 0

Francois Gouget : testbot/CheckForWinetestUpdate: Fix the Wine reconfig timeout.
by Alexandre Julliard 27 Jun '18

27 Jun '18

Module: tools Branch: master Commit: 1445ea351b83119323bbafe2ddbb5511346f4882 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1445ea351b83119323bbafe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 27 08:07:50 2018 +0200 testbot/CheckForWinetestUpdate: Fix the Wine reconfig timeout. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index d3ef384..a570a1b 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -286,7 +286,9 @@ sub AddReconfigJob($) Debug(" $VMKey $VMType reconfig\n"); my $Task = $BuildStep->Tasks->Add(); $Task->VM($VM); - $Task->Timeout($ReconfigTimeout); + $Task->Timeout($VMType eq "wine" ? + 3 * $WineReconfigTimeout : # 3 full Wine builds + $ReconfigTimeout); # 1 overall timeout } # Save the build step so the others can reference it.

1 0

Francois Gouget : testbot/WineRun*: Prefix the TestBot errors so they are easy to identify.
by Alexandre Julliard 27 Jun '18

27 Jun '18

Module: tools Branch: master Commit: 8873568e7149f59f160ffd9cf563447317198474 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8873568e7149f59f160ffd9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 27 08:08:45 2018 +0200 testbot/WineRun*: Prefix the TestBot errors so they are easy to identify. Some scripts may need to detect them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunTask.pl | 2 +- testbot/bin/WineRunWineTest.pl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 176ade6..90b9f03 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -269,7 +269,7 @@ sub FatalError($;$) my ($ErrMessage, $Retry) = @_; LogMsg "$JobId/$StepNo/$TaskNo $ErrMessage"; - LogTaskError($ErrMessage); + LogTaskError("BotError: $ErrMessage"); WrapUpAndExit('boterror', $Retry); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index e418e5b..83f358c 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -269,7 +269,7 @@ sub FatalError($;$) my ($ErrMessage, $Retry) = @_; LogMsg "$JobId/$StepNo/$TaskNo $ErrMessage"; - LogTaskError($ErrMessage); + LogTaskError("BotError: $ErrMessage"); WrapUpAndExit('boterror', $Retry); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 821ca55..fb29663 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -319,7 +319,7 @@ sub FatalError($;$) my ($ErrMessage, $Retry) = @_; LogMsg "$JobId/$StepNo/$TaskNo $ErrMessage"; - LogTaskError($ErrMessage); + LogTaskError("BotError: $ErrMessage"); WrapUpAndExit('boterror', undef, $Retry); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 83cf582..1e43f9a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -320,7 +320,7 @@ sub FatalError($;$) my ($ErrMessage, $Retry) = @_; LogMsg "$JobId/$StepNo/$TaskNo $ErrMessage"; - LogTaskError($ErrMessage); + LogTaskError("BotError: $ErrMessage"); WrapUpAndExit('boterror', undef, $Retry); }

1 0