Bladeren bron

Switch to PO after the first file in the test. This speeds up pn_interface.alc tests

Yentl Van Tendeloo 9 jaren geleden
bovenliggende
commit
d0fa898c03
3 gewijzigde bestanden met toevoegingen van 6 en 4 verwijderingen
  1. 3 3
      integration/code/pn_interface.alc
  2. 0 1
      integration/test_pn_interface.py
  3. 3 0
      integration/utils.py

+ 3 - 3
integration/code/pn_interface.alc

@@ -94,7 +94,7 @@ Element function petrinet_fire(model : Element):
 		output("Unknown transition; aborting")
 	return model
 	
-Element function petrinet_loaded(model : Element):
+Element function model_loaded(model : Element):
 	String cmd
 
 	Element attr_list_pn
@@ -387,7 +387,7 @@ Element function initial_prompt():
 				else:
 					my_model = instantiate_model(root[mm_name])
 					dict_add(root, name, my_model)
-					petrinet_loaded(my_model)
+					model_loaded(my_model)
 			else:
 				output("Unknown metamodel; aborting")
 		elif (command == "load"):
@@ -395,7 +395,7 @@ Element function initial_prompt():
 			name = input()
 			if (dict_in(root, name)):
 				my_model = root[name]
-				petrinet_loaded(my_model)
+				model_loaded(my_model)
 			else:
 				output("Model not found; aborting")
 		elif (command == "list"):

+ 0 - 1
integration/test_pn_interface.py

@@ -25,7 +25,6 @@ all_files = [   "pn_interface.alc",
                 "object_operations.alc",
                 "conformance_scd.alc",
                 "library.alc",
-                "constructors.alc",
                 "metamodels.alc",
                 "--fast",
             ]

+ 3 - 0
integration/utils.py

@@ -131,6 +131,9 @@ def run_file(files, parameters, expected, mode):
             else:
                 compile_file(address, mod_filename, filename, mode, proc)
 
+            # After the first file, which can be whatever we want, we just have to compile dependencies, all of which are PO for efficiency
+            mode = "PO"
+
         if parallel_push:
             for t in threads:
                 t.join()