wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to avoid test failures in reg tests.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-08-20 18:37:58 +02:00
parent 5adb9710aa
commit 14cfabe8ab
2 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/patchinstall.sh
View File

@ -324,6 +324,7 @@ patch_enable_all ()
enable_packager_DllMain="$1"
enable_quartz_MediaSeeking_Positions="$1"
enable_quartz_Silence_FIXMEs="$1"
enable_reg_Tests="$1"
enable_riched20_Class_Tests="$1"
enable_riched20_IText_Interface="$1"
enable_rpcrt4_Race_Condition="$1"
@ -1244,6 +1245,9 @@ patch_enable ()
quartz-Silence_FIXMEs)
enable_quartz_Silence_FIXMEs="$2"
;;
reg-Tests)
enable_reg_Tests="$2"
;;
riched20-Class_Tests)
enable_riched20_Class_Tests="$2"
;;
@ -7420,6 +7424,18 @@ if test "$enable_quartz_Silence_FIXMEs" -eq 1; then
) >> "$patchlist"
fi
# Patchset reg-Tests
# |
# | Modified files:
# | * programs/reg/tests/reg.c
# |
if test "$enable_reg_Tests" -eq 1; then
patch_apply reg-Tests/0001-reg-tests-Avoid-test-failures.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "reg/tests: Avoid test failures.", 1 },';
) >> "$patchlist"
fi
# Patchset riched20-Class_Tests
# |
# | Modified files:

54
patches/reg-Tests/0001-reg-tests-Avoid-test-failures.patch Normal file
View File

@ -0,0 +1,54 @@
From 5f6ebde73f07d0292c80bf47f6943d71715293ab Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 20 Aug 2017 18:37:35 +0200
Subject: reg/tests: Avoid test failures.
---
programs/reg/tests/reg.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c
index b042614f49a..c2a97b25fb5 100644
--- a/programs/reg/tests/reg.c
+++ b/programs/reg/tests/reg.c
@@ -2980,7 +2980,7 @@ static void test_unicode_import(void)
err = RegQueryValueExA(hkey, "Wine44i", NULL, &type, (BYTE *)&buffer, &size);
ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err);
ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ);
- todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size);
+ ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size);
ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n");
/* Wine44j */
size = sizeof(buffer);
@@ -2988,7 +2988,7 @@ static void test_unicode_import(void)
err = RegQueryValueExA(hkey, "Wine44j", NULL, &type, (BYTE *)&buffer, &size);
ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err);
ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ);
- todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size);
+ ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size);
ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n");
/* Wine44k */
verify_reg_nonexist(hkey, "Wine44k");
@@ -3622,7 +3622,7 @@ static void test_unicode_import(void)
ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */,
"got %u, expected 0\n", err);
if (err == ERROR_SUCCESS)
- verify_reg(hkey, "Wine62d", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE);
+ verify_reg(hkey, "Wine62d", REG_MULTI_SZ, "Line", 5, 0);
test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
@@ -3721,8 +3721,8 @@ static void test_unicode_import(void)
"\"Wine66e\"=hex(7):4c,00,69,00,6e,00,65,00,00,00,00,00\n"
"\"Wine66f\"=hex(7):4c,00,69,00,6e,00,65,00,00,00,00,00,\n\n", &r);
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
- verify_reg(hkey, "Wine66a", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE);
- verify_reg(hkey, "Wine66b", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE);
+ verify_reg(hkey, "Wine66a", REG_MULTI_SZ, "Line", 5, 0);
+ verify_reg(hkey, "Wine66b", REG_MULTI_SZ, "Line", 5, 0);
verify_reg(hkey, "Wine66c", REG_MULTI_SZ, "Line", 5, 0);
verify_reg(hkey, "Wine66d", REG_MULTI_SZ, "Line", 5, 0);
verify_reg(hkey, "Wine66e", REG_MULTI_SZ, "Line\0", 6, 0);
--
2.14.1