From b247a1ee7019703a6809fa19915eccc9ecf6ca47 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 10 Dec 2021 16:24:34 +0000 Subject: [PATCH] Use testdata.conf for the wxPATH_NORM_LONG test This file already exists in the test directory, as it's used by another test, so just use it instead of relying on the existing of mkinstalldirs in the parent directory, which is not guaranteed as CMake build runs the tests from a different directory, which is not the immediate child of the top source directory. --- tests/filename/filenametest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp index c38c9fa442..64b1ed49cf 100644 --- a/tests/filename/filenametest.cpp +++ b/tests/filename/filenametest.cpp @@ -382,9 +382,9 @@ TEST_CASE("wxFileName::Normalize", "[filename]") ).QueryValue("NtfsDisable8dot3NameCreation", &shortNamesDisabled) && !shortNamesDisabled ) { - wxFileName fn("..\\MKINST~1"); + wxFileName fn("TESTDA~1.CON"); CHECK( fn.Normalize(wxPATH_NORM_LONG, cwd) ); - CHECK( fn.GetFullPath() == "..\\mkinstalldirs" ); + CHECK( fn.GetFullPath() == "testdata.conf" ); } //else: when in doubt, don't run the test #endif // __WINDOWS__