Signed-off-by: Dmitry Timoshkov dmitry@baikal.ru --- dlls/msi/tests/custom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index f06aee0675..c6e9f1eb52 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -512,10 +512,10 @@ static void test_db(MSIHANDLE hinst) { r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); - }
- r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL); - ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, NULL); + ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); + }
r = MsiCloseHandle(suminfo); ok(hinst, !r, "got %u\n", r);
Hi,
While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=42225
Your paranoid android.
=== w7u (32 bit Windows report) ===
msi: action: Timeout
=== w7u (task log) ===
Task errors: The previous 1 run(s) terminated abnormally
=== wxppro (32 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w2003std (32 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== wvistau64 (32 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== wvistau64_zh_CN (32 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== wvistau64_fr (32 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== wvistau64_he (32 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w2008s64 (32 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w7u (32 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87 install: Timeout
Report errors: msi:install contains a misplaced failure message for custom
=== w7pro64 (32 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w8 (32 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w8adm (32 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w864 (32 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w1064 (32 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== wvistau64 (64 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w2008s64 (64 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w7pro64 (64 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w864 (64 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
=== w1064 (64 bit Windows report) ===
msi: custom.c:517: Test failed: 2: got 87 custom.c:517: Test failed: 7: got 87 custom.c:517: Test failed: 9: got 87
Report errors: msi:install contains a misplaced failure message for custom
On Wed, 2018-09-19 at 13:27 +0800, Dmitry Timoshkov wrote:
Signed-off-by: Dmitry Timoshkov dmitry@baikal.ru
dlls/msi/tests/custom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index f06aee0675..c6e9f1eb52 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -512,10 +512,10 @@ static void test_db(MSIHANDLE hinst) { r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r);
}
r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL);
ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r);
r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, NULL);
ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r);
}
r = MsiCloseHandle(suminfo); ok(hinst, !r, "got %u\n", r);
This is causing new test failures. The testbot fails recognize them however, probably because they come from custom.c instead of the test module that was invoked, install.c.
Hans Leidekker hans@codeweavers.com wrote:
This is causing new test failures. The testbot fails recognize them however, probably because they come from custom.c instead of the test module that was invoked, install.c.
I resent 2 last patches, let's see how it goes. Sending the patch alone to the testbot didn't work: "test 'custom' doesn't exist".
On Wed, 19 Sep 2018, Hans Leidekker wrote: [...]
This is causing new test failures. The testbot fails recognize them however, probably because they come from custom.c instead of the test module that was invoked, install.c.
It does recognize them. They are even bolded orange since they are new failures and the summary at the top says Failures 4.
https://testbot.winehq.org/JobDetails.pl?Key=42225#k1001
But yes, the TestBot is a bit confused because the errors don't come from a known test unit which is why it issues an extra error:
msi:install contains a misplaced failure message for custom
The problem is there is no 'custom' test unit:
* You cannot run 'msi_test.exe custom'.
* There is no "xxx:custom: 123 tests executed...' summary line.
* Nothing ties 'custom' error messages to any real test unit such as 'install', 'action', etc. So when parsing the WineTest results there is no way to know where these messages are coming from.
I don't know how to improve handling of these cases. * The simplest for me would be if they issued 'install' errors instead but that would be confusing since the error does not come from install.c. So that's out.
* Maybe add a new type of line to tie custom messages to the install test unit?
0b40:install: Loading custom sub test unit.
On 19/09/18 09:15, Francois Gouget wrote:
On Wed, 19 Sep 2018, Hans Leidekker wrote: [...]
This is causing new test failures. The testbot fails recognize them however, probably because they come from custom.c instead of the test module that was invoked, install.c.
I don't know how to improve handling of these cases.
- The simplest for me would be if they issued 'install' errors instead but that would be confusing since the error does not come from install.c. So that's out.
Besides which it's used from multiple test units (action.c). Possibly it shouldn't be, but I think the below proposed solution seems much better.
Maybe add a new type of line to tie custom messages to the install test unit?
0b40:install: Loading custom sub test unit.