From 33da3375532bdc404fe305a8eb6f1ba8bf07efa0 Mon Sep 17 00:00:00 2001 From: Lakshmi Priya Sekar Date: Mon, 31 Aug 2015 17:23:01 -0700 Subject: [PATCH] Fix directory longname test failures on Linux. --- .../file_io/CreateDirectoryA/test1/CreateDirectoryA.c | 13 ++++++++----- .../file_io/CreateDirectoryW/test1/CreateDirectoryW.c | 16 ++++++++++------ .../file_io/FindFirstFileA/test1/FindFirstFileA.c | 4 ++-- .../SetCurrentDirectoryA/test1/SetCurrentDirectoryA.c | 4 ++-- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CreateDirectoryA.c b/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CreateDirectoryA.c index bad2ae2..af306b0 100644 --- a/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CreateDirectoryA.c +++ b/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CreateDirectoryA.c @@ -24,7 +24,7 @@ #if WIN32 #define CREATE_MAX_PATH_SIZE 248 #else -#define CREATE_MAX_PATH_SIZE MAX_LONGPATH +#define CREATE_MAX_PATH_SIZE _MAX_PATH #endif @@ -199,10 +199,13 @@ int __cdecl main(int argc, char *argv[]) szDirName, GetLastError()); } - Fail("CreateDirectoryA: Failed because it created a directory" - " name 1 character longer (%d chars) than the max dir size " - "allowed\n", - strlen(szDirName)); + if (strlen(szDirName) > CREATE_MAX_PATH_SIZE) + { + Fail("CreateDirectoryA: Failed because it created a directory" + " name 1 character longer (%d chars) than the max dir size " + "allowed\n", + strlen(szDirName)); + } } diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CreateDirectoryW.c b/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CreateDirectoryW.c index ea51f1c..4e91201 100644 --- a/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CreateDirectoryW.c +++ b/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CreateDirectoryW.c @@ -20,7 +20,7 @@ #if WIN32 #define CREATE_MAX_PATH_SIZE 248 #else -#define CREATE_MAX_PATH_SIZE MAX_LONGPATH +#define CREATE_MAX_PATH_SIZE _MAX_PATH #endif @@ -215,11 +215,14 @@ int __cdecl main(int argc, char *argv[]) "delete the directory with error %u.\n", GetLastError()); } - free(pTemp); - Fail("CreateDirectoryW: Failed because it created a directory" - " name 1 character longer (%d chars) than the max dir size" - " allowed\n", - strlen(szDirName)); + if (strlen(szDirName) > CREATE_MAX_PATH_SIZE) + { + free(pTemp); + Fail("CreateDirectoryW: Failed because it created a directory" + " name 1 character longer (%d chars) than the max dir size" + " allowed\n", + strlen(szDirName)); + } } free(pTemp); @@ -342,3 +345,4 @@ int __cdecl main(int argc, char *argv[]) PAL_Terminate(); return PASS; } + diff --git a/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/FindFirstFileA.c b/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/FindFirstFileA.c index 2e6c6a5..0046df4 100644 --- a/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/FindFirstFileA.c +++ b/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/FindFirstFileA.c @@ -25,7 +25,7 @@ const char* szDirNameSlash = "test_dir\\"; const char* szDirNameWldCard_01 = "?est_dir"; const char* szDirNameWldCard_02 = "test_*"; /* Longer than MAX_LONGPATH characters */ -const char* szLongFindName = "testingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtesting"; +char szLongFindName[MAX_LONGPATH+1]; BOOL CleanUp() { @@ -68,7 +68,7 @@ int __cdecl main(int argc, char *argv[]) BOOL bRc = FALSE; WCHAR* szwTemp = NULL; - + memset(szLongFindName, 'a', MAX_LONGPATH+1); if (0 != PAL_Initialize(argc,argv)) { return FAIL; diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/SetCurrentDirectoryA.c b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/SetCurrentDirectoryA.c index 71283b2..43e5e89 100644 --- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/SetCurrentDirectoryA.c +++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/SetCurrentDirectoryA.c @@ -60,13 +60,13 @@ int __cdecl main(int argc, char *argv[]) { const char* szDirName = "testing"; /* directory name longer than MAX_PATH characters */ - const char* szLongDirName = "testingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtestingtesting"; + char szLongDirName[MAX_LONGPATH+1]; char szNewDir[_MAX_DIR+1]; char szBuiltDir[_MAX_DIR+1]; char szHomeDir[_MAX_DIR+1]; WCHAR* szwPtr = NULL; - + memset(szLongDirName, 'a', MAX_LONGPATH+1); if (0 != PAL_Initialize(argc,argv)) { return FAIL; -- 2.7.4