Skip to content

Fix concat_dir_file for Windows and unit-test it #2688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 6, 2018
Merged

Fix concat_dir_file for Windows and unit-test it #2688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/util/file_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,8 @@ std::string concat_dir_file(
const std::string &file_name)
{
#ifdef _WIN32
return (file_name.size()>1 &&
file_name[0]!='/' &&
file_name[1]!=':') ?
file_name : directory+"\\"+file_name;
return (file_name.size() > 1 && file_name[0] != '/' && file_name[1] == ':') ?
file_name : directory + "\\" + file_name;
#else
return (!file_name.empty() && file_name[0]=='/') ?
file_name : directory+"/"+file_name;
Expand Down
21 changes: 21 additions & 0 deletions unit/util/file_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,27 @@ Author: Daniel Kroening

#include <fstream>

TEST_CASE("concat_dir_file functionality", "[core][util][file_util]")
{
temp_dirt temp_dir("testXXXXXX");
const std::string path = concat_dir_file(temp_dir.path, "bla.txt");

REQUIRE(path.size() > temp_dir.path.size() + std::string("bla.txt").size());
#ifdef _WIN32
REQUIRE(path.find('\\') != std::string::npos);
#else
REQUIRE(path.find('/') != std::string::npos);
#endif

#ifdef _WIN32
const std::string qualified_path = "z:\some\path\foo.txt";
#else
const std::string qualified_path = "/some/path/foo.txt";
#endif
const std::string path2 = concat_dir_file(temp_dir.path, qualified_path);
REQUIRE(path2 == qualified_path);
}

TEST_CASE("is_directory functionality", "[core][util][file_util]")
{
temp_dirt temp_dir("testXXXXXX");
Expand Down