minor test refactors (#16947)

Changelog: Omit Docs: Omit
conan-io · Sep 6, 2024 · d99c714 · d99c714
2 parents 6acce7b + b0e812d
commit d99c714
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 121 deletions.
diff --git a/test/functional/settings/__init__.py b/test/functional/settings/__init__.py
diff --git a/test/functional/settings/cppstd/__init__.py b/test/functional/settings/cppstd/__init__.py
diff --git a/test/functional/settings/cppstd/compiler_cppstd_test.py b/test/functional/settings/cppstd/compiler_cppstd_test.py
diff --git a/test/functional/settings/libcxx_setting_test.py b/test/functional/settings/libcxx_setting_test.py
diff --git a/...tings/conan_settings_preprocessor_test.py → ...extensions/test_profile_plugin_runtime.py b/...tings/conan_settings_preprocessor_test.py → ...extensions/test_profile_plugin_runtime.py
diff --git a/test/integration/toolchains/cmake/test_cmaketoolchain.py b/test/integration/toolchains/cmake/test_cmaketoolchain.py
@@ -1728,3 +1728,16 @@ def test_tricore():
     assert 'string(APPEND CONAN_C_FLAGS " -mtc131")' in content
     assert 'string(APPEND CONAN_SHARED_LINKER_FLAGS " -mtc131")' in content
     assert 'string(APPEND CONAN_EXE_LINKER_FLAGS " -mtc131")' in content
+
+
+def test_declared_stdlib_and_passed():
+    client = TestClient()
+    client.save({"conanfile.txt": "[generators]\nCMakeToolchain"})
+
+    client.run('install . -s compiler=sun-cc -s compiler.libcxx=libCstd')
+    tc = client.load("conan_toolchain.cmake")
+    assert 'string(APPEND CONAN_CXX_FLAGS " -library=Cstd")' in tc
+
+    client.run('install . -s compiler=sun-cc -s compiler.libcxx=libstdcxx')
+    tc = client.load("conan_toolchain.cmake")
+    assert 'string(APPEND CONAN_CXX_FLAGS " -library=stdcxx4")' in tc