浏览代码

Fixed tests again

Yentl Van Tendeloo 9 年之前
父节点
当前提交
0083127eb6
共有 2 个文件被更改,包括 4 次插入1 次删除
  1. 1 1
      bootstrap/conformance_scd.alc
  2. 3 0
      integration/test_constructors_models.py

+ 1 - 1
bootstrap/conformance_scd.alc

@@ -204,7 +204,7 @@ String function conformance_scd(model : Element):
 				String result
 				result = constraint_function(model, model_name)
 				if (result != "OK"):
-					return result + model_info(model, model_name)
+					return result
 
 	// Check multiplicities, if they are defined (optional)
 	Element metamodel_keys

+ 3 - 0
integration/test_constructors_models.py

@@ -185,6 +185,8 @@ def add_constraints(model):
     return [
             '"model"',
             '"add_constraint"', model, '"Integer"',
+                '"funcdef"',
+                '"constraint"',
                 '2', model*100, model*100+1,
                     '"if"',
                         '"call"',
@@ -210,6 +212,7 @@ def add_constraints(model):
                             'true',
                                 '"const"', '"Integer instance is not an integer."',
                         'false',
+                    'false',
             '"exit"',
         ]