Imported Upstream version 3.12.0upstream/3.12.0

7 files changed, 85 insertions, 13 deletions

diff --git a/Tests/CMakeLib/CMakeLists.txt b/Tests/CMakeLib/CMakeLists.txt
index 06df53f50..126076d8d 100644
--- a/Tests/CMakeLib/CMakeLists.txt
+++ b/Tests/CMakeLib/CMakeLists.txt
@@ -49,3 +49,6 @@ if(TEST_CompileCommandOutput)
 endif()
 
 add_subdirectory(PseudoMemcheck)
+
+add_executable(testAffinity testAffinity.cxx)
+target_link_libraries(testAffinity CMakeLib)
diff --git a/Tests/CMakeLib/testAffinity.cxx b/Tests/CMakeLib/testAffinity.cxx
new file mode 100644
index 000000000..4b8228092
--- /dev/null
+++ b/Tests/CMakeLib/testAffinity.cxx
@@ -0,0 +1,18 @@
+/* Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+   file Copyright.txt or https://cmake.org/licensing for details.  */
+#include "cmAffinity.h"
+
+#include <cstddef>
+#include <iostream>
+#include <set>
+
+int main()
+{
+  std::set<size_t> cpus = cmAffinity::GetProcessorsAvailable();
+  if (!cpus.empty()) {
+    std::cout << "CPU affinity mask count is '" << cpus.size() << "'.\n";
+  } else {
+    std::cout << "CPU affinity not supported on this platform.\n";
+  }
+  return 0;
+}
diff --git a/Tests/CMakeLib/testEncoding.cxx b/Tests/CMakeLib/testEncoding.cxx
index 11f64098e..d608e86d7 100644
--- a/Tests/CMakeLib/testEncoding.cxx
+++ b/Tests/CMakeLib/testEncoding.cxx
@@ -3,7 +3,7 @@
 #include <string>
 
 #ifdef _WIN32
-#include "cmsys/ConsoleBuf.hxx"
+#  include "cmsys/ConsoleBuf.hxx"
 #endif
 
 #ifdef _WIN32
diff --git a/Tests/CMakeLib/testRST.expect b/Tests/CMakeLib/testRST.expect
index fa436cb91..1ffd6b966 100644
--- a/Tests/CMakeLib/testRST.expect
+++ b/Tests/CMakeLib/testRST.expect
@@ -16,7 +16,13 @@ Variable ``<PLACEHOLDER>_VARIABLE`` with leading placeholder.
 Variable ``VARIABLE_<PLACEHOLDER>`` with trailing placeholder.
 Variable ``<PLACEHOLDER>_VARIABLE`` with leading placeholder and target.
 Variable ``VARIABLE_<PLACEHOLDER>`` with trailing placeholder and target.
+Environment variable ``SOME_ENV_VAR``.
+Environment variable ``some env var`` with space and target.
 Generator ``Some Generator`` with space.
+Inline literal ``~!@#$%^&*( )_+-=\\[]{}'":;,<>.?/``.
+Inline link Link Text.
+Inline link Link Text <With \-escaped Brackets>.
+Inline literal ``__`` followed by inline link Link Text.
 
 First TOC entry.
 
diff --git a/Tests/CMakeLib/testRST.rst b/Tests/CMakeLib/testRST.rst
index 54952dd9f..c8587c036 100644
--- a/Tests/CMakeLib/testRST.rst
+++ b/Tests/CMakeLib/testRST.rst
@@ -23,7 +23,13 @@ Variable :variable:`<PLACEHOLDER>_VARIABLE` with leading placeholder.
 Variable :variable:`VARIABLE_<PLACEHOLDER>` with trailing placeholder.
 Variable :variable:`<PLACEHOLDER>_VARIABLE <target>` with leading placeholder and target.
 Variable :variable:`VARIABLE_<PLACEHOLDER> <target>` with trailing placeholder and target.
+Environment variable :envvar:`SOME_ENV_VAR`.
+Environment variable :envvar:`some env var <SOME_ENV_VAR>` with space and target.
 Generator :generator:`Some Generator` with space.
+Inline literal ``~!@#$%^&*( )_+-=\\[]{}'":;,<>.?/``.
+Inline link `Link Text <ExternalDest>`_.
+Inline link `Link Text \<With \\-escaped Brackets\> <ExternalDest>`_.
+Inline literal ``__`` followed by inline link `Link Text <InternalDest_>`_.
 
 .. |not replaced| replace:: not replaced through toctree
 .. |not replaced in literal| replace:: replaced in parsed literal
diff --git a/Tests/CMakeLib/testUVRAII.cxx b/Tests/CMakeLib/testUVRAII.cxx
index 44def2527..e165ff7c0 100644
--- a/Tests/CMakeLib/testUVRAII.cxx
+++ b/Tests/CMakeLib/testUVRAII.cxx
@@ -30,7 +30,8 @@ static bool testAsyncShutdown()
     std::thread([&] {
       std::this_thread::sleep_for(std::chrono::seconds(2));
       signal.send();
-    }).detach();
+    })
+      .detach();
 
     if (uv_run(&Loop, UV_RUN_DEFAULT) != 0) {
       std::cerr << "Unclean exit state in testAsyncDtor" << std::endl;
diff --git a/Tests/CMakeLib/testVisualStudioSlnParser.cxx b/Tests/CMakeLib/testVisualStudioSlnParser.cxx
index f8bcfae85..c7fd585cc 100644
--- a/Tests/CMakeLib/testVisualStudioSlnParser.cxx
+++ b/Tests/CMakeLib/testVisualStudioSlnParser.cxx
@@ -45,17 +45,55 @@ int testVisualStudioSlnParser(int, char* [])
     }
     const std::vector<cmSlnProjectEntry>& projects = data.GetProjects();
     const char* const names[] = {
-      "3rdParty", "ALL_BUILD", "CMakeLib", "CMakeLibTests",
-      "CMakePredefinedTargets", "CPackLib", "CTestDashboardTargets",
-      "CTestLib", "Continuous", "Documentation", "Experimental", "INSTALL",
-      "KWSys", "LIBCURL", "Nightly", "NightlyMemoryCheck", "PACKAGE",
-      "RUN_TESTS", "Tests", "Utilities", "Win9xCompat", "ZERO_CHECK",
-      "cmIML_test", "cmake", "cmbzip2", "cmcldeps", "cmcompress", "cmcurl",
-      "cmexpat", "cmlibarchive", "cmsys", "cmsysEncodeExecutable",
-      "cmsysProcessFwd9x", "cmsysTestDynload", "cmsysTestProcess",
-      "cmsysTestSharedForward", "cmsysTestsC", "cmsysTestsCxx", "cmsys_c",
-      "cmw9xcom", "cmzlib", "cpack", "ctest", "documentation", "memcheck_fail",
-      "pseudo_BC", "pseudo_purify", "pseudo_valgrind", "test_clean",
+      "3rdParty",
+      "ALL_BUILD",
+      "CMakeLib",
+      "CMakeLibTests",
+      "CMakePredefinedTargets",
+      "CPackLib",
+      "CTestDashboardTargets",
+      "CTestLib",
+      "Continuous",
+      "Documentation",
+      "Experimental",
+      "INSTALL",
+      "KWSys",
+      "LIBCURL",
+      "Nightly",
+      "NightlyMemoryCheck",
+      "PACKAGE",
+      "RUN_TESTS",
+      "Tests",
+      "Utilities",
+      "Win9xCompat",
+      "ZERO_CHECK",
+      "cmIML_test",
+      "cmake",
+      "cmbzip2",
+      "cmcldeps",
+      "cmcompress",
+      "cmcurl",
+      "cmexpat",
+      "cmlibarchive",
+      "cmsys",
+      "cmsysEncodeExecutable",
+      "cmsysProcessFwd9x",
+      "cmsysTestDynload",
+      "cmsysTestProcess",
+      "cmsysTestSharedForward",
+      "cmsysTestsC",
+      "cmsysTestsCxx",
+      "cmsys_c",
+      "cmw9xcom",
+      "cmzlib",
+      "cpack",
+      "ctest",
+      "documentation",
+      "memcheck_fail",
+      "pseudo_BC",
+      "pseudo_purify",
+      "pseudo_valgrind",
+      "test_clean",
       "uninstall"
       /* clang-format needs this comment to break after the opening brace */
     };