wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Nikolay Sivov : xmllite: Recognize us-ascii encoding.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: wine Branch: master Commit: ef023c3fd65658884256f70779326018d4e5094a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef023c3fd65658884256f7077… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 30 21:35:16 2017 +0300 xmllite: Recognize us-ascii encoding. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 6 ++++-- dlls/xmllite/tests/writer.c | 7 +++++++ dlls/xmllite/xmllite_private.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b4b455b..6056418 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -84,6 +84,7 @@ typedef enum StringValue_Last } XmlReaderStringValue; +static const WCHAR usasciiW[] = {'U','S','-','A','S','C','I','I',0}; static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; static const WCHAR utf8W[] = {'U','T','F','-','8',0}; @@ -154,8 +155,9 @@ struct xml_encoding_data }; static const struct xml_encoding_data xml_encoding_map[] = { + { usasciiW, XmlEncoding_USASCII, 20127 }, { utf16W, XmlEncoding_UTF16, ~0 }, - { utf8W, XmlEncoding_UTF8, CP_UTF8 } + { utf8W, XmlEncoding_UTF8, CP_UTF8 }, }; const WCHAR *get_encoding_name(xml_encoding encoding) @@ -734,7 +736,7 @@ xml_encoding parse_encoding_name(const WCHAR *name, int len) if (!name) return XmlEncoding_Unknown; min = 0; - max = sizeof(xml_encoding_map)/sizeof(struct xml_encoding_data) - 1; + max = sizeof(xml_encoding_map)/sizeof(xml_encoding_map[0]) - 1; while (min <= max) { diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 0508466..74546e0 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -275,6 +275,7 @@ static void test_writer_create(void) static void test_writeroutput(void) { static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; + static const WCHAR usasciiW[] = {'u','s','-','a','s','c','i','i',0}; IXmlWriterOutput *output; IUnknown *unk; HRESULT hr; @@ -312,6 +313,12 @@ todo_wine /* releasing 'unk' crashes on native */ IUnknown_Release(output); IUnknown_Release(output); + + /* create with us-ascii */ + output = NULL; + hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, usasciiW, &output); + ok(hr == S_OK, "got %08x\n", hr); + IUnknown_Release(output); } static void test_writestartdocument(void) diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index fa29265..702fadb 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -64,6 +64,7 @@ static inline void m_free(IMalloc *imalloc, void *mem) typedef enum { + XmlEncoding_USASCII, XmlEncoding_UTF16, XmlEncoding_UTF8, XmlEncoding_Unknown

1 0

Francois Gouget : testbot: Don' t rerun the tests if only the makefile was modified.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: tools Branch: master Commit: 2e7a90c1568a9d77d5bca80c7342e537e732a22b URL: http://source.winehq.org/git/tools.git/?a=commit;h=2e7a90c1568a9d77d5bca80c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 3 01:50:27 2017 +0200 testbot: Don't rerun the tests if only the makefile was modified. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d7987d6..d5de05e 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -170,6 +170,8 @@ sub Submit($$$) elsif ($Line =~ m~^\+\+\+ .*/(dlls|programs)/([^/]+)/tests/([^/\s]+)~) { my ($FileType, $Module, $Unit) = ("patch$1", $2, $3); + # Assume makefile modifications may break the build but not the tests + next if ($Unit eq "Makefile.in"); $Unit = "" if ($Unit !~ s/\.c$//); $Modules{$Module}{$Unit} = $FileType; }

1 0

Francois Gouget : testbot: Rerun all of a module' s test units when a non-C file is modified.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: tools Branch: master Commit: 83dc05b3eb3244bd6de4ce41d46834ccd73f2edf URL: http://source.winehq.org/git/tools.git/?a=commit;h=83dc05b3eb3244bd6de4ce41… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 3 01:50:23 2017 +0200 testbot: Rerun all of a module's test units when a non-C file is modified. This typically happens when a resource file is modified or a test unit is deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 12 ++++++ testbot/bin/build/Reconfig.pl | 5 +++ testbot/lib/WineTestBot/Patches.pm | 87 +++++++++++++++++++++++++++++++------- 3 files changed, 89 insertions(+), 15 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 151c80f..737d26f 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -370,6 +370,18 @@ elsif (!defined $TAError) { $TAError = "An error occurred while retrieving the reconfig log: ". $TA->GetLastError(); } + +Debug(Elapsed($Start), " Retrieving the updated test list '$TaskDir/testlist.txt'\n"); +if ($TA->GetFile("testlist.txt", "$TaskDir/testlist.txt")) +{ + use File::Copy; + copy "$TaskDir/testlist.txt", "$DataDir/latest/testlist.txt"; +} +elsif (!defined $TAError) +{ + $TAError = "An error occurred while retrieving the test list: ". $TA->GetLastError(); +} + $TA->Disconnect(); # Report the reconfig errors even though they may have been caused by diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 81a487f..ec7f05f 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -67,6 +67,11 @@ sub GitPull() return !1; } + system("( cd $DataDir/wine && ". + " ls dlls/*/tests/*.c programs/*/tests/*.c | ". + " egrep -v '/testlist.c\$' >../testlist.txt ". + ") >>$LogDir/Reconfig.log 2>&1"); + return 1; } diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 48f2156..d7987d6 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -103,6 +103,37 @@ sub FromSubmission($$) $self->Disposition("Processing"); } + +=pod +=over 12 + +=item C<GetTestList()> + +Returns a hashtable containing the list of the source files for a given module. +This structure is built from the latest/testlist.txt file. + +=back +=cut + +sub GetTestList() +{ + my $TestList = {}; + if (open(my $File, "<", "$DataDir/latest/testlist.txt")) + { + while (my $TestFileName = <$File>) + { + chomp $TestFileName; + if ($TestFileName =~ m~^(?:dlls|programs)/([^/]+)/tests/[^/]+\.c$~) + { + my $Module = $1; + push @{$TestList->{$Module}}, $TestFileName; + } + } + close($File); + } + return $TestList; +} + =pod =over 12 @@ -126,28 +157,29 @@ sub Submit($$$) my ($self, $PatchFileName, $IsSet) = @_; # See also OnSubmit() in web/Submit.pl - my %Modules; + my (%Modules, %Deleted); if (open(BODY, "<$DataDir/patches/" . $self->Id)) { - my $Line; + my ($Line, $Modified); while (defined($Line = <BODY>)) { - if ($Line =~ m~^\+\+\+ .*/(dlls|programs)/([^/]+)/tests/([^/\s]+)~) + if ($Line =~ m~^\-\-\- .*/((?:dlls|programs)/[^/]+/tests/[^/\s]+)~) + { + $Modified = $1; + } + elsif ($Line =~ m~^\+\+\+ .*/(dlls|programs)/([^/]+)/tests/([^/\s]+)~) { my ($FileType, $Module, $Unit) = ("patch$1", $2, $3); $Unit = "" if ($Unit !~ s/\.c$//); - if ($Unit) - { - if (defined($Modules{$Module}{""})) - { - delete($Modules{$Module}{""}); - } - $Modules{$Module}{$Unit} = $FileType; - } - elsif (! defined($Modules{$Module})) - { - $Modules{$Module}{""} = $FileType; - } + $Modules{$Module}{$Unit} = $FileType; + } + elsif ($Line =~ m~^\+\+\+ /dev/null~ and defined $Modified) + { + $Deleted{$Modified} = 1; + } + else + { + $Modified = undef; } } close BODY; @@ -175,6 +207,31 @@ sub Submit($$$) $User = GetBatchUser(); } + my $TestList; + foreach my $Module (keys %Modules) + { + next if (!defined $Modules{$Module}{""}); + + # The patch modifies non-C files so rerun all that module's test units + $TestList = GetTestList() if (!$TestList); + next if (!defined $TestList->{$Module}); + + # If we don't find which tests to rerun then run the module test + # executable without argument. It probably won't work but will make the + # issue clearer to the developer. + my $FileType = $Modules{$Module}{""}; + foreach my $TestFileName (@{$TestList->{$Module}}) + { + if (!$Deleted{$TestFileName} and + $TestFileName =~ m~^(?:dlls|programs)/\Q$Module\E/tests/([^/]+)\.c$~) + { + my $Unit = $1; + $Modules{$Module}{$Unit} = $FileType; + delete $Modules{$Module}{""}; + } + } + } + my $Disposition = "Submitted job "; my $First = 1; foreach my $Module (keys %Modules)

1 0

Francois Gouget : testbot: Reuse Wine's module and test unit terminology.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: tools Branch: master Commit: c2714abd8e854091a8cdb683a946a9c311532cdb URL: http://source.winehq.org/git/tools.git/?a=commit;h=c2714abd8e854091a8cdb683… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 3 01:48:53 2017 +0200 testbot: Reuse Wine's module and test unit terminology. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 43 +++++++++++++++----------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index e2a1225..48f2156 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -126,7 +126,7 @@ sub Submit($$$) my ($self, $PatchFileName, $IsSet) = @_; # See also OnSubmit() in web/Submit.pl - my %Targets; + my %Modules; if (open(BODY, "<$DataDir/patches/" . $self->Id)) { my $Line; @@ -134,35 +134,26 @@ sub Submit($$$) { if ($Line =~ m~^\+\+\+ .*/(dlls|programs)/([^/]+)/tests/([^/\s]+)~) { - my $FileType = "patch$1"; - my $BaseName = $2; - my $TestSet = $3; - if ($TestSet =~ m/^(.*)\.c$/) + my ($FileType, $Module, $Unit) = ("patch$1", $2, $3); + $Unit = "" if ($Unit !~ s/\.c$//); + if ($Unit) { - $TestSet = $1; - } - else - { - $TestSet = ""; - } - if ($TestSet) - { - if (defined($Targets{$BaseName}{""})) + if (defined($Modules{$Module}{""})) { - delete($Targets{$BaseName}{""}); + delete($Modules{$Module}{""}); } - $Targets{$BaseName}{$TestSet} = $FileType; + $Modules{$Module}{$Unit} = $FileType; } - elsif (! defined($Targets{$BaseName})) + elsif (! defined($Modules{$Module})) { - $Targets{$BaseName}{""} = $FileType; + $Modules{$Module}{""} = $FileType; } } } close BODY; } - if (! scalar(%Targets)) + if (! scalar(%Modules)) { $self->Disposition(($IsSet ? "Set" : "Patch") . " doesn't affect tests"); @@ -186,7 +177,7 @@ sub Submit($$$) my $Disposition = "Submitted job "; my $First = 1; - foreach my $BaseName (keys %Targets) + foreach my $Module (keys %Modules) { my $Jobs = WineTestBot::Jobs::CreateJobs(); @@ -209,8 +200,8 @@ sub Submit($$$) # Create a link to the patch file in the staging dir my $StagingFileName = CreateNewLink($PatchFileName, "$DataDir/staging", "_patch.diff"); $NewStep->FileName(basename($StagingFileName)); - my @Keys = keys %{$Targets{$BaseName}}; - $NewStep->FileType($Targets{$BaseName}{$Keys[0]}); + my @Keys = keys %{$Modules{$Module}}; + $NewStep->FileType($Modules{$Module}{$Keys[0]}); $NewStep->InStaging(1); $NewStep->Type("build"); $NewStep->DebugLevel(0); @@ -224,7 +215,7 @@ sub Submit($$$) $Task->VM($BuildVM); $Task->Timeout($BuildTimeout); - foreach my $TestSet (keys %{$Targets{$BaseName}}) + foreach my $Unit (keys %{$Modules{$Module}}) { # Add 32 and 64-bit tasks foreach my $Bits ("32", "64") @@ -236,8 +227,8 @@ sub Submit($$$) { # Create the corresponding Step $NewStep = $Steps->Add(); - my $FileName = $BaseName; - $FileName .= ".exe" if ($Targets{$BaseName}{$TestSet} eq "patchprograms"); + my $FileName = $Module; + $FileName .= ".exe" if ($Modules{$Module}{$Unit} eq "patchprograms"); $FileName .= "_test"; $FileName .= "64" if ($Bits eq "64"); $NewStep->FileName("$FileName.exe"); @@ -253,7 +244,7 @@ sub Submit($$$) my $Task = $Tasks->Add(); $Task->VM($VM); $Task->Timeout($SingleTimeout); - $Task->CmdLineArg($TestSet); + $Task->CmdLineArg($Unit); } } }

1 0

Francois Gouget : winetest: resultform.html is no longer needed.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: tools Branch: master Commit: 5aa6538714cd435a7ed56c7fae2981ee1811be18 URL: http://source.winehq.org/git/tools.git/?a=commit;h=5aa6538714cd435a7ed56c7f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 3 01:48:41 2017 +0200 winetest: resultform.html is no longer needed. It was only used for the popup window. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/INSTALL.txt | 1 - winetest/resultform.html | 44 -------------------------------------------- 2 files changed, 45 deletions(-) diff --git a/winetest/INSTALL.txt b/winetest/INSTALL.txt index e6bba9d..d3f21dd 100644 --- a/winetest/INSTALL.txt +++ b/winetest/INSTALL.txt @@ -43,7 +43,6 @@ Web site account: - Then create symbolic links to the web site's scripts: cd $HOME/sites/winetest ln -s /home/wine/tools/winetest/report.css - ln -s /home/wine/tools/winetest/resultform.html ln -s /home/wine/tools/winetest/summary.css ln -s /home/wine/tools/winetest/winetest.cgi - Create the queue directory and make it writable by the web server diff --git a/winetest/resultform.html b/winetest/resultform.html deleted file mode 100644 index 9cfb67f..0000000 --- a/winetest/resultform.html +++ /dev/null @@ -1,44 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" - "http://www.w3.org/TR/html4/strict.dtd"> -<html> -<head> - <title>Test details</title> - - <meta http-equiv="Content-Type" - content="text/html; charset=ISO-8859-1"> - <meta name="Author" - content="Ferenc W�gner"> -</head> - -<body> -<h5>Test under the mouse:</h5> -<form action="" name="results"> - <table> - <tr> - <td>Test</td> - <td><input type="text" name="test" size="18" readonly></td> - </tr> - <tr> - <td>Version</td> - <td><input type="text" name="version" size="18" readonly></td> - </tr> - <tr> - <td>Tests</td> - <td><input type="text" name="tests" size="10" readonly></td> - </tr> - <tr> - <td>Errors</td> - <td><input type="text" name="errors" size="10" readonly></td> - </tr> - <tr> - <td>Todos</td> - <td><input type="text" name="todo" size="10" readonly></td> - </tr> - <tr> - <td>Skips</td> - <td><input type="text" name="skipped" size="10" readonly></td> - </tr> - </table> -</form> -</body> -</html>

1 0

Francois Gouget : winetest: Add instructions for using WineTest with the site.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: tools Branch: master Commit: 9c0ec47754735860eb0cdee431024f3285f9534c URL: http://source.winehq.org/git/tools.git/?a=commit;h=9c0ec47754735860eb0cdee4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 3 01:48:30 2017 +0200 winetest: Add instructions for using WineTest with the site. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/INSTALL.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/winetest/INSTALL.txt b/winetest/INSTALL.txt index d102956..e6bba9d 100644 --- a/winetest/INSTALL.txt +++ b/winetest/INSTALL.txt @@ -111,4 +111,8 @@ FIXME Document how to set it up. Run it in yet another account since it ---------- You can manually upload WineTest reports by accessing the following URL: -http://test.example.com/submit + + http://test.example.com/submit + +Alternatively you can tell WineTest.exe to upload its report to your site using +the above URL and the -S option.

1 0

Alexandre Julliard : patches: Add a patch status for replies to a patch.
by Alexandre Julliard 03 Apr '17

03 Apr '17

Module: tools Branch: master Commit: 045638407bea42e8cdc68b1b354d7ecdaf862390 URL: http://source.winehq.org/git/tools.git/?a=commit;h=045638407bea42e8cdc68b1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 13:10:54 2017 +0200 patches: Add a patch status for replies to a patch. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 3 +++ patches/patches.css | 1 + patches/update | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/patches/expire b/patches/expire index fd5ba22..cba6246 100755 --- a/patches/expire +++ b/patches/expire @@ -35,6 +35,7 @@ my %status_expiry = "formatting" => 7, "other" => 7, "nopatch" => 3, + "reply" => 7, "rejected" => 7, "split" => 7, "depend" => 7, @@ -59,6 +60,7 @@ my %status_descr = "formatting" => "Formatting", "other" => "Other project", "nopatch" => "No patch", + "reply" => "Reply", "rejected" => "Rejected", "split" => "Needs splitting", "depend" => "Dependency", @@ -141,6 +143,7 @@ the patch is correct.", # No notifications are sent for the following: # "nil" # "signoff" +# "reply" # "superseded" # "testfail" ); diff --git a/patches/patches.css b/patches/patches.css index 2799827..c1ef34f 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -159,6 +159,7 @@ tr.odd { background-color: #f8e8e8; } .deferred, .deferred :link, .deferred :visited { color: #e08000; } .testcase, .testcase :link, .testcase :visited { color: #e08000; } .signoff, .signoff :link, .signoff :visited { color: #e08000; } +.reply, .reply :link, .reply :visited { color: #e08000; } .other, .other :link, .other :visited { color: #e08000; } .applyfail, .applyfail :link, .applyfail :visited { color: red; } .buildfail, .buildfail :link, .buildfail :visited { color: red; } diff --git a/patches/update b/patches/update index ad2b82a..cdc172d 100755 --- a/patches/update +++ b/patches/update @@ -43,6 +43,7 @@ my %status_descr = "testcase" => "Needs tests", "testfail" => "Test failure", "signoff" => "Sign-off", + "reply" => "Reply", ); my @legend = @@ -59,6 +60,7 @@ my @legend = [ "testcase", "<ul><li>You need to write some test cases demonstrating that the patch is correct.</li></ul>" ], [ "deferred", "<ul><li>The patch is deferred because of code freeze for an upcoming release. Either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release.</li></ul>" ], [ "signoff", "<ul><li>This is a Signed-off-by reply to another patch.</li></ul>" ], + [ "reply", "<ul><li>The mail is a reply to another patch.</li></ul>" ], [ "other", "<ul><li>The patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.</li></ul>" ], [ "applyfail", "<ul><li>The patch got mangled in transit.</li>" . "<li>It's not relative to the latest git.</li>" . @@ -73,8 +75,7 @@ my @legend = "<li>8-bit chars got mangled in transit (usually when sending patches to translation files).</li>" . "<li>You are making gratuitous formatting changes to the code.</li>" . "<li>You are using C++ comments.</li></ul>" ], - [ "nopatch", "<ul><li>You hit 'send' before attaching the patch.</li>" . - "<li>The mail is a reply to another patch, or spam.</li></ul>" ], + [ "nopatch", "<ul><li>You hit 'send' before attaching the patch.</li></ul>" ], [ "rejected", "<ul><li>The patch has been rejected with a comment on wine-devel or #winehackers.</li>" . "<li>The patch contains an obvious error that you are expected to figure out yourself.</li></ul>" ], [ "split", "<ul><li>A single mail contained multiple patch files.</li>" .

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017