Update the MvC perf tests

performance/test_mvc_model_overwrite.py

@@ -74,6 +74,7 @@ class TestMvCModelOverwrite(unittest.TestCase):
                     "  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
                     "  200  root nobody   Empty : SimpleClassDiagrams",
+                    "  221  root admin   ActionLanguage : SimpleClassDiagrams",
                     "  200  root admin   core : CoreFormalism"
                 ]),
                 "Ready for command...",
@@ -89,6 +90,7 @@ class TestMvCModelOverwrite(unittest.TestCase):
                 set([
                     "  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
+                    "  221  root admin   ActionLanguage : SimpleClassDiagrams",
                     "  200  root nobody   Empty : SimpleClassDiagrams",
                     "  200  root admin   core : CoreFormalism"
                 ]),
@@ -100,6 +102,7 @@ class TestMvCModelOverwrite(unittest.TestCase):
                 set([
                     "  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
+                    "  221  root admin   ActionLanguage : SimpleClassDiagrams",
                     "  200  root nobody   Empty : SimpleClassDiagrams",
                     "  200  root admin   core : CoreFormalism"
                 ]),

performance/test_mvc_print_upload.py

@@ -67,6 +67,7 @@ class TestMvCPrintUpload(unittest.TestCase):
                 set([
                     "  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
+                    "  221  root admin   ActionLanguage : SimpleClassDiagrams",
                     "  200  root nobody   PetriNets : SimpleClassDiagrams",
                     "  200  root admin   core : CoreFormalism"
                 ]),
@@ -78,6 +79,7 @@ class TestMvCPrintUpload(unittest.TestCase):
                     "  221  root admin   SimpleClassDiagrams : SimpleClassDiagrams",
                     "  221  root admin   CoreFormalism : SimpleClassDiagrams",
                     "  200  root nobody   PetriNets : SimpleClassDiagrams",
+                    "  221  root admin   ActionLanguage : SimpleClassDiagrams",
                     "  200  root nobody   __merged_PetriNets_RAM : SimpleClassDiagrams",
                     "  200  root nobody   PetriNets_RAM : SimpleClassDiagrams",
                     "  200  root admin   core : CoreFormalism"

performance/test_mvc_simulate.py

@@ -154,6 +154,7 @@ class TestMvCSimulate(unittest.TestCase):
                 "Ready for command...",
                 # model_list
                 set(["  SimpleClassDiagrams : SimpleClassDiagrams",
+                     "  ActionLanguage : SimpleClassDiagrams",
                      "  CoreFormalism : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
                      "  my_pn : PetriNets",
@@ -166,6 +167,7 @@ class TestMvCSimulate(unittest.TestCase):
                 "Ready for command...",
                 # model_list
                 set(["  SimpleClassDiagrams : SimpleClassDiagrams",
+                     "  ActionLanguage : SimpleClassDiagrams",
                      "  CoreFormalism : SimpleClassDiagrams",
                      "  PetriNets_Runtime : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
@@ -279,6 +281,7 @@ class TestMvCSimulate(unittest.TestCase):
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
                      "  my_pn : PetriNets",
+                     "  ActionLanguage : SimpleClassDiagrams",
                      "  core : CoreFormalism"]),
                 "Ready for command...",
                 # transformation_list

performance/test_mvc_simulate_larger.py

@@ -49,7 +49,7 @@ class TestMvCSimulateLarger(unittest.TestCase):
         utils.write_perf_to_file(
             'mvc_large', optimization_level,
             utils.run_correctness_test(all_files,
-            ["root", "root", "root",
+            [ "root", "root", "root",
                 "model_add",
                     "SimpleClassDiagrams",
                     "PetriNets",
@@ -182,6 +182,7 @@ class TestMvCSimulateLarger(unittest.TestCase):
                      "  CoreFormalism : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
                      "  my_pn : PetriNets",
+                     "  ActionLanguage : SimpleClassDiagrams",
                      "  PetriNets_Runtime : SimpleClassDiagrams",
                      "  core : CoreFormalism"]),
                 "Ready for command...",
@@ -194,6 +195,7 @@ class TestMvCSimulateLarger(unittest.TestCase):
                      "  CoreFormalism : SimpleClassDiagrams",
                      "  PetriNets_Runtime : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
+                     "  ActionLanguage : SimpleClassDiagrams",
                      "  __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  PetriNets_RAM : SimpleClassDiagrams",
                      "  my_pn : PetriNets",
@@ -297,6 +299,7 @@ class TestMvCSimulateLarger(unittest.TestCase):
                      "  CoreFormalism : SimpleClassDiagrams",
                      "  PetriNets_Runtime : SimpleClassDiagrams",
                      "  PetriNets : SimpleClassDiagrams",
+                     "  ActionLanguage : SimpleClassDiagrams",
                      "  pn_print : PetriNets_RAM",
                      "  pn_design_to_runtime : PetriNets_RAM",
                      "  pn_runtime_to_design : PetriNets_RAM",

performance/utils.py

@@ -108,7 +108,7 @@ def compile_file(address, mod_filename, filename, mode, proc):
     """Compiles the given file."""
     # Load in the file required
     try:
-        timeout_val = 240
+        timeout_val = 600
         taskname = str(random.random())
         while 1:
             proc2 = execute(