sat #18867 : pour les url des bases git : substitution des references par leur valeur...

[tools/sat.git] / commands / check.py

diff --git a/commands/check.py b/commands/check.py
index a5eeadc3133a7d7a83e0a0b24b2aa12695d7c6ea..ffb31af02439e35014fd8904df00541e23165cca 100644 (file)
--- a/commands/check.py
+++ b/commands/check.py
@@ -85,21 +85,27 @@ def check_product(p_name_info, config, logger):
 
     # Verify if the command has to be launched or not
     ignored = False
-    if not src.get_property_in_product_cfg(p_info, CHECK_PROPERTY):
-        msg = _("The product %s is defined as not having tests. "
+    if src.product.product_is_native(p_info):
+        msg = _("The product %s is defined as being native. "
                 "product ignored." % p_name)
         logger.write("%s\n" % msg, 4)
         ignored = True
-    if "build_dir" not in p_info:
-        msg = _("No build_dir key defined in "
-                "the config file of %s: product ignored." % p_name)
+    elif not src.get_property_in_product_cfg(p_info, CHECK_PROPERTY):
+        msg = _("The product %s is defined as not having tests. "
+                "product ignored." % p_name)
         logger.write("%s\n" % msg, 4)
         ignored = True
-    if not src.product.product_compiles(p_info):
+    elif not src.product.product_compiles(p_info):
         msg = _("The product %s is defined as not compiling. "
                 "product ignored." % p_name)
         logger.write("%s\n" % msg, 4)
         ignored = True
+    elif "build_dir" not in p_info:
+        msg = _("No build_dir key defined in "
+                "the config file of %s: product ignored." % p_name)
+        logger.write("%s\n" % msg, 4)
+        ignored = True
+
 
     # Get the command to execute for script products
     cmd_found = True
@@ -127,7 +133,7 @@ def check_product(p_name_info, config, logger):
     
     # Instantiate the class that manages all the construction commands
     # like cmake, check, make install, make test, environment management, etc...
-    builder = src.compilation.Builder(config, logger, p_info)
+    builder = src.compilation.Builder(config, logger, p_name, p_info)
     
     # Prepare the environment
     log_step(logger, header, "PREPARE ENV")