diff options
| author | Oleh Herasym <oolleehh@gmail.com> | 2016-06-22 12:03:11 +0300 |
|---|---|---|
| committer | Anton Hrytsevich <AGritsevich@users.noreply.github.com> | 2016-06-22 12:03:11 +0300 |
| commit | bc90b1a97e3d6a28f55ec1801f8bc58610c8b1b1 (patch) | |
| tree | cffcb71c6404aa0986006ecaca185eeb265112bf | |
| parent | 55792358990e7cbaa96092148b6a20cb49359367 (diff) | |
| download | sdl_core-bc90b1a97e3d6a28f55ec1801f8bc58610c8b1b1.tar.gz | |
Fix/config profile tests on win (#630)
* Fix ini_file issue
On Windows platform tmpnam return NULL.
Also current function is not recommended to use, there is bugs.
Change using tmpnam to _tempnam
Related: APPLINK-25520
* Fix config_profile tests
Related: APPLINK-25520
| -rw-r--r-- | src/components/config_profile/src/ini_file.cc | 6 | ||||
| -rw-r--r-- | src/components/config_profile/test/profile_test.cc | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/components/config_profile/src/ini_file.cc b/src/components/config_profile/src/ini_file.cc index 553cd38626..c5f723342d 100644 --- a/src/components/config_profile/src/ini_file.cc +++ b/src/components/config_profile/src/ini_file.cc @@ -166,12 +166,11 @@ char ini_write_value(const char* fname, char line[INI_LINE_LEN] = ""; char val[INI_LINE_LEN] = ""; char tag[INI_LINE_LEN] = ""; - char temp_fname[PATH_MAX] = ""; + char temp_fname[PATH_MAX] = "fileXXXXXX"; Ini_search_id result; *line = '\0'; *val = '\0'; *tag = '\0'; - *temp_fname = '\0'; if ((NULL == fname) || (NULL == chapter) || (NULL == item) || (NULL == value)) return FALSE; @@ -206,7 +205,8 @@ char ini_write_value(const char* fname, } } #else // #if USE_MKSTEMP - tmpnam(temp_fname); + const char temp_directory[] = ""; + _tempnam(temp_directory, temp_fname); if (0 == (wr_fp = fopen(temp_fname, "w"))) { fclose(rd_fp); return FALSE; diff --git a/src/components/config_profile/test/profile_test.cc b/src/components/config_profile/test/profile_test.cc index 5bb3d96dfc..6ebf4c2ade 100644 --- a/src/components/config_profile/test/profile_test.cc +++ b/src/components/config_profile/test/profile_test.cc @@ -37,6 +37,7 @@ #include "config_profile/profile.h" #include "utils/file_system.h" #include "utils/threads/thread.h" +#include "utils/file_system.h" namespace test { namespace components { @@ -490,7 +491,7 @@ TEST_F(ProfileTest, StringValueIncludeSlashesAndRussianLetters) { EXPECT_EQ(tts_delimiter_, profile_.tts_delimiter()); std::string server_address = "127.0.0.1 + слово"; EXPECT_EQ(server_address, profile_.server_address()); - app_storage_folder = "/\" \""; + app_storage_folder = file_system::GetPathDelimiter() + "\" \""; EXPECT_EQ(current_dir + app_storage_folder, profile_.app_storage_folder()); // Update config file |