.bashrc exists only with bash shell while .profile exists always

Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
This commit is contained in:
FrancisANDRE 2016-01-05 05:20:40 +01:00
parent df61181582
commit bc22588895

View File

@ -1511,15 +1511,15 @@ void PathTest::testForDirectory()
void PathTest::testExpand() void PathTest::testExpand()
{ {
#if defined(POCO_OS_FAMILY_UNIX) #if defined(POCO_OS_FAMILY_UNIX)
std::string s = Path::expand("~/.bashrc"); std::string s = Path::expand("~/.profile");
assert (s == Path::expand("$HOME/.bashrc")); assert (s == Path::expand("$HOME/.profile"));
assert (s == Environment::get("HOME") + "/.bashrc" || assert (s == Environment::get("HOME") + "/.profile" ||
s == Environment::get("HOME") + "//.bashrc"); s == Environment::get("HOME") + "//.profile");
Path p(s); Path p(s);
s = Path::expand("$HOME/.bashrc"); s = Path::expand("$HOME/.profile");
assert (s == Path::expand("~/.bashrc")); assert (s == Path::expand("~/.profile"));
s = Path::expand("${HOME}/.bashrc"); s = Path::expand("${HOME}/.profile");
assert (s == Path::expand("~/.bashrc")); assert (s == Path::expand("~/.profile"));
#elif defined(POCO_OS_FAMILY_WINDOWS) #elif defined(POCO_OS_FAMILY_WINDOWS)
std::string s = Path::expand("%TMP%\\foo"); std::string s = Path::expand("%TMP%\\foo");
assert (s == Environment::get("TMP") + "\\foo"); assert (s == Environment::get("TMP") + "\\foo");