I'm not sure if the GetTempPathW() dir is okay for this. d3dx11 seems to do the same in tests, so I copied that approach.
Commit message:
The wine testbot runs tests with C:\Users\Public\Documents as the working directory. Itemdlg tests create test files in the working directory and then try to select them for opening in an IFileOpenDialog. The dialog has its SetFolder method called to point it to the current working directory before showing the dialog, in order for the test code to find the test files it had created there just before opening the dialog.
On Windows, this failed because calling the dialog's SetFolder method with C:\Users\Public\Documents doesn't work as expected. The dialog points to the C:\Users\[CURRENT_USER]\Documents directory instead. Subsequently, the test would be unable to select the test file because it doesn't exist in that directory. So the dialog wouldn't accept the file and close itself to finish the test, but show an error message instead, resulting in a test timeout.
To fix this, set the current working directory to the temporary directory before calling individual itemdlg test_* functions. Switch back to the previous working directory after tests finish.
-- v3: comdlg32/tests: Fix itemdlg tests on Windows.
From: Florian Will florian.will@gmail.com
The wine testbot runs tests with C:\Users\Public\Documents as the working directory. Itemdlg tests create test files in the working directory and then try to select them for opening in an IFileOpenDialog. The dialog has its SetFolder method called to point it to the current working directory before showing the dialog, in order for the test code to find the test files it had created there just before opening the dialog.
On Windows, this failed because calling the dialog's SetFolder method with C:\Users\Public\Documents doesn't work as expected. The dialog points to the C:\Users[CURRENT_USER]\Documents directory instead. Subsequently, the test would be unable to select the test file because it doesn't exist in that directory. So the dialog wouldn't accept the file and close itself to finish the test, but show an error message instead, resulting in a test timeout.
To fix this, set the current working directory to the temporary directory before calling individual itemdlg test_* functions. --- v2: Don't restore previous working dir after tests. v3: Update commit message to reflect v2 change. --- dlls/comdlg32/tests/itemdlg.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index bba869ad091..9b4560fced8 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -2467,6 +2467,16 @@ START_TEST(itemdlg)
if(test_instantiation()) { + DWORD result_tmpdir; + BOOL result_set_dir; + WCHAR tmpdir[MAX_PATH]; + + /* Windows refuses to open a dialog for C:\Users\Public\Documents, so change to tmp */ + result_tmpdir = GetTempPathW(MAX_PATH, tmpdir); + ok(result_tmpdir != 0, "got %ld\n", result_tmpdir); + result_set_dir = SetCurrentDirectoryW(tmpdir); + ok(result_set_dir, "failed to set dir\n"); + test_basics(); test_advise(); test_events();
This merge request was approved by Esme Povirk.
-
Esme Povirk (＠madewokherd) -
Florian Will
-
Florian Will (＠w-flo)