diff options
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/docs/TestingLibcxx.rst | 2 | ||||
| -rw-r--r-- | libcxx/test/support/filesystem_dynamic_test_helper.py | 2 | ||||
| -rw-r--r-- | libcxx/test/support/filesystem_test_helper.hpp | 4 | ||||
| -rw-r--r-- | libcxx/utils/libcxx/test/format.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libcxx/docs/TestingLibcxx.rst b/libcxx/docs/TestingLibcxx.rst index e4292764c4d..5c48ebe61dd 100644 --- a/libcxx/docs/TestingLibcxx.rst +++ b/libcxx/docs/TestingLibcxx.rst @@ -119,7 +119,7 @@ configuration. Passing the option on the command line will override the default. .. option:: libcxx_site_config=<path/to/lit.site.cfg> Specify the site configuration to use when running the tests. This option - overrides the enviroment variable LIBCXX_SITE_CONFIG. + overrides the environment variable LIBCXX_SITE_CONFIG. .. option:: cxx_headers=<path/to/headers> diff --git a/libcxx/test/support/filesystem_dynamic_test_helper.py b/libcxx/test/support/filesystem_dynamic_test_helper.py index d2b2810d099..081e678b6e8 100644 --- a/libcxx/test/support/filesystem_dynamic_test_helper.py +++ b/libcxx/test/support/filesystem_dynamic_test_helper.py @@ -25,7 +25,7 @@ def sanitize(p): """ Some of the tests restrict permissions to induce failures. -Before we delete the test enviroment, we have to walk it and re-raise the +Before we delete the test environment, we have to walk it and re-raise the permissions. """ def clean_recursive(root_p): diff --git a/libcxx/test/support/filesystem_test_helper.hpp b/libcxx/test/support/filesystem_test_helper.hpp index 6cc0e370a78..755be90351f 100644 --- a/libcxx/test/support/filesystem_test_helper.hpp +++ b/libcxx/test/support/filesystem_test_helper.hpp @@ -227,7 +227,7 @@ private: } static inline void fs_helper_run(std::string const& raw_cmd) { - // check that the fs test root in the enviroment matches what we were + // check that the fs test root in the environment matches what we were // compiled with. static bool checked = checkDynamicTestRoot(); ((void)checked); @@ -246,7 +246,7 @@ private: std::abort(); } if (std::string(fs_root) != LIBCXX_FILESYSTEM_DYNAMIC_TEST_ROOT) { - std::printf("ERROR: LIBCXX_FILESYSTEM_DYNAMIC_TEST_ROOT enviroment variable" + std::printf("ERROR: LIBCXX_FILESYSTEM_DYNAMIC_TEST_ROOT environment variable" " must have the same value as when the test was compiled.\n"); std::printf(" Current Value: '%s'\n", fs_root); std::printf(" Expected Value: '%s'\n", LIBCXX_FILESYSTEM_DYNAMIC_TEST_ROOT); diff --git a/libcxx/utils/libcxx/test/format.py b/libcxx/utils/libcxx/test/format.py index c3bc97187ad..3ac5472b472 100644 --- a/libcxx/utils/libcxx/test/format.py +++ b/libcxx/utils/libcxx/test/format.py @@ -139,7 +139,7 @@ class LibcxxTestFormat(object): # We can't run ShTest tests with a executor yet. # For now, bail on trying to run them return lit.Test.UNSUPPORTED, 'ShTest format not yet supported' - test.config.enviroment = dict(self.exec_env) + test.config.environment = dict(self.exec_env) return lit.TestRunner._runShTest(test, lit_config, self.execute_external, script, tmpBase) |
