diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/base/environment_unittest.cc | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/base/environment_unittest.cc')
| -rw-r--r-- | chromium/base/environment_unittest.cc | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/chromium/base/environment_unittest.cc b/chromium/base/environment_unittest.cc index ef264cf619f..80e3aa6e441 100644 --- a/chromium/base/environment_unittest.cc +++ b/chromium/base/environment_unittest.cc @@ -14,11 +14,22 @@ typedef PlatformTest EnvironmentTest; namespace base { +namespace { + +// Fuchsia doesn't set PATH, Windows doesn't set PWD. (Fuchsia may eventually +// set PATH and then this can be removed again.) +#if defined(OS_FUCHSIA) +constexpr char kValidEnvironmentVariable[] = "PWD"; +#else +constexpr char kValidEnvironmentVariable[] = "PATH"; +#endif + +} // namespace + TEST_F(EnvironmentTest, GetVar) { - // Every setup should have non-empty PATH... std::unique_ptr<Environment> env(Environment::Create()); std::string env_value; - EXPECT_TRUE(env->GetVar("PATH", &env_value)); + EXPECT_TRUE(env->GetVar(kValidEnvironmentVariable, &env_value)); EXPECT_NE(env_value, ""); } @@ -51,9 +62,8 @@ TEST_F(EnvironmentTest, GetVarReverse) { } TEST_F(EnvironmentTest, HasVar) { - // Every setup should have PATH... std::unique_ptr<Environment> env(Environment::Create()); - EXPECT_TRUE(env->HasVar("PATH")); + EXPECT_TRUE(env->HasVar(kValidEnvironmentVariable)); } TEST_F(EnvironmentTest, SetVar) { |