From 6c4c1eb2996890f7633eb64ed0f55977528f865a Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Thu, 15 Jul 2021 16:10:23 +0000 Subject: [PATCH 1/2] Fix #1105, Add independent OS_rename functional test parameter checks --- src/unit-tests/osfile-test/ut_osfile_fileio_test.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/unit-tests/osfile-test/ut_osfile_fileio_test.c b/src/unit-tests/osfile-test/ut_osfile_fileio_test.c index 0e54b6729..078cec401 100644 --- a/src/unit-tests/osfile-test/ut_osfile_fileio_test.c +++ b/src/unit-tests/osfile-test/ut_osfile_fileio_test.c @@ -1093,23 +1093,26 @@ void UT_os_renamefile_test() /*-----------------------------------------------------*/ /* #2 Invalid-path-arg */ - UT_RETVAL(OS_rename(g_invalidPath, g_invalidPath), OS_FS_ERR_PATH_INVALID); + UT_RETVAL(OS_rename(g_invalidPath, g_fNames[1]), OS_FS_ERR_PATH_INVALID); + UT_RETVAL(OS_rename(g_fNames[0], g_invalidPath), OS_FS_ERR_PATH_INVALID); /*-----------------------------------------------------*/ /* #3 Path-too-long-arg */ - UT_RETVAL(OS_rename(g_longPathName, g_longPathName), OS_FS_ERR_PATH_TOO_LONG); + UT_RETVAL(OS_rename(g_longPathName, g_fNames[1]), OS_FS_ERR_PATH_TOO_LONG); + UT_RETVAL(OS_rename(g_fNames[0], g_longPathName), OS_FS_ERR_PATH_TOO_LONG); /*-----------------------------------------------------*/ /* #4 Name-too-long-arg */ - UT_RETVAL(OS_rename(g_longFileName, g_longFileName), OS_FS_ERR_NAME_TOO_LONG); + UT_RETVAL(OS_rename(g_longFileName, g_fNames[1]), OS_FS_ERR_NAME_TOO_LONG); + UT_RETVAL(OS_rename(g_fNames[0], g_longFileName), OS_FS_ERR_NAME_TOO_LONG); /*-----------------------------------------------------*/ /* #6 Nominal */ memset(g_fNames[0], '\0', sizeof(g_fNames[0])); - memset(g_fNames[0], '\0', sizeof(g_fNames[1])); + memset(g_fNames[1], '\0', sizeof(g_fNames[1])); UT_os_sprintf(g_fNames[0], "%s/Rename_Nom_Old.txt", g_mntName); UT_os_sprintf(g_fNames[1], "%s/Rename_Nom_New.txt", g_mntName); From 1e7fbf404f49a1a26b8522483fd6df4701276aa7 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Wed, 21 Jul 2021 10:25:01 -0400 Subject: [PATCH 2/2] IC:2021-07-20, Bump to v5.1.0-rc1+dev573 --- README.md | 4 ++++ src/os/inc/osapi-version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6448c487e..da399b8d5 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,10 @@ The autogenerated OSAL user's guide can be viewed at and ### Development Build: v5.1.0-rc1+dev569 diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index e118b2b99..d36faaa2c 100644 --- a/src/os/inc/osapi-version.h +++ b/src/os/inc/osapi-version.h @@ -36,7 +36,7 @@ /* * Development Build Macro Definitions */ -#define OS_BUILD_NUMBER 569 +#define OS_BUILD_NUMBER 573 #define OS_BUILD_BASELINE "v5.1.0-rc1" /*