wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to fix test failure in dmloader tests.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-05-01 19:50:27 +02:00
parent 1d7d9cf626
commit 46bcbf913f
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
patches/dmloader-Tests/0001-dmloader-tests-Fix-test-failures.patch Normal file
View File

@ -0,0 +1,31 @@
From dabf89ee29066b7a133ca2fb1e5c05a8100a0365 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 1 May 2017 19:49:41 +0200
Subject: dmloader/tests: Fix test failures.
---
dlls/dmloader/tests/loader.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c
index 6b2ee3ad93..1735994088 100644
--- a/dlls/dmloader/tests/loader.c
+++ b/dlls/dmloader/tests/loader.c
@@ -66,11 +66,11 @@ static void test_directory(void)
/* Two consecutive SetSearchDirectory with the same path */
GetTempPathW(ARRAY_SIZE(path), path);
hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, path, 0);
- todo_wine ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr);
+ ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr);
hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, path, 0);
- ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr);
+ todo_wine ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr);
hr = IDirectMusicLoader_SetSearchDirectory(loader, &CLSID_DirectSoundWave, path, 0);
- ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr);
+ todo_wine ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr);
hr = IDirectMusicLoader_SetSearchDirectory(loader, &CLSID_DirectSoundWave, path, 0);
ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr);
--
2.12.2

16
patches/patchinstall.sh
View File

@ -143,6 +143,7 @@ patch_enable_all ()
enable_ddraw_Write_Vtable="$1"
enable_devenum_AudioCompressorCategory="$1"
enable_dinput_Initialize="$1"
enable_dmloader_Tests="$1"
enable_dmusic_SynthPort_IKsControl="$1"
enable_dsound_EAX="$1"
enable_dsound_Fast_Mixer="$1"
@ -653,6 +654,9 @@ patch_enable ()
dinput-Initialize)
enable_dinput_Initialize="$2"
;;
dmloader-Tests)
enable_dmloader_Tests="$2"
;;
dmusic-SynthPort_IKsControl)
enable_dmusic_SynthPort_IKsControl="$2"
;;
@ -3811,6 +3815,18 @@ if test "$enable_dinput_Initialize" -eq 1; then
) >> "$patchlist"
fi
# Patchset dmloader-Tests
# |
# | Modified files:
# | * dlls/dmloader/tests/loader.c
# |
if test "$enable_dmloader_Tests" -eq 1; then
patch_apply dmloader-Tests/0001-dmloader-tests-Fix-test-failures.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "dmloader/tests: Fix test failures.", 1 },';
) >> "$patchlist"
fi
# Patchset dmusic-SynthPort_IKsControl
# |
# | This patchset fixes the following Wine bugs: