further testing subsystems (#11530)

* further testing subsystems * wip * wip * fix test, add checks * fix tests * add clang tests * fix tests * fix tests * Update conans/client/conf/__init__.py Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * Update conans/client/migrations_settings.py Co-authored-by: Carlos Zoido <mrgalleta@gmail.com> * remove settings Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
conan-io · Jul 6, 2022 · 3123a9a · 3123a9a
1 parent 345be91
commit 3123a9a
Show file tree

Hide file tree

Showing 7 changed files with 351 additions and 120 deletions.
diff --git a/conans/test/assets/autotools.py b/conans/test/assets/autotools.py
@@ -55,12 +55,12 @@ def gen_makefile(**context):
         {% for lib in libs %}
         {%- set link_libs.str = link_libs.str + ' -l' + lib|string  %}
         lib{{lib}}.a: {{lib}}.o
-        	$(AR) rcs lib{{lib}}.a {{lib}}.o
+        	$(AR) rcs lib{{lib}}.a {{lib}}.o {%if static_runtime%}--static{%endif%}
         {% endfor %}
 
         {% for s in apps %}
         {{s}}: {{s}}.o libs
-        	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o {{s}} {{s}}.o $(LIBS) {{link_libs.str}} -L.
+        	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o {{s}} {{s}}.o $(LIBS) {{link_libs.str}} -L. {%if static_runtime%}--static{%endif%}
         {% endfor %}
         """)
 

diff --git a/conans/test/conftest.py b/conans/test/conftest.py
@@ -92,6 +92,13 @@
         "exe": "mingw32-make",
         "system": {"path": {'Windows': "C:/msys64/mingw32/bin"}},
     },
+    'ucrt64': {
+        "disabled": True,
+        "platform": "Windows",
+        "default": "system",
+        "exe": "mingw32-make",
+        "system": {"path": {'Windows': "C:/msys64/ucrt64/bin"}},
+    },
     'mingw64': {
         "platform": "Windows",
         "default": "system",
@@ -104,6 +111,20 @@
         "exe": "make",
         "system": {"path": {'Windows': "C:/msys64/usr/bin"}},
     },
+    'msys2_clang64': {
+        "disabled": True,
+        "platform": "Windows",
+        "default": "system",
+        "exe": "mingw32-make",
+        "system": {"path": {'Windows': "C:/msys64/clang64/bin"}},
+    },
+    'msys2_mingw64_clang64': {
+        "disabled": True,
+        "platform": "Windows",
+        "default": "system",
+        "exe": "mingw32-make",
+        "system": {"path": {'Windows': "C:/msys64/mingw64/bin"}},
+    },
     'cygwin': {
         "platform": "Windows",
         "default": "system",
@@ -156,6 +177,8 @@ def update(d, u):
 tools_environments = {
     'mingw32': {'Windows': {'MSYSTEM': 'MINGW32'}},
     'mingw64': {'Windows': {'MSYSTEM': 'MINGW64'}},
+    'ucrt64': {'Windows': {'MSYSTEM': 'UCRT64'}},
+    'msys2_clang64': {"Windows": {"MSYSTEM": "CLANG64"}},
     'android_ndk': {'Darwin': {'TEST_CONAN_ANDROID_NDK': '/usr/local/share/android-ndk'}}
 }