Commit 70017e7a authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files

Merge branch 'master' of https://gitlab.lrz.de/vadere/vadere

parents 6eeaa8c1 dbbaad09
Pipeline #75614 failed with stages
in 76 minutes and 8 seconds
...@@ -32,6 +32,7 @@ VadereModelTests/TestOSM/output/* ...@@ -32,6 +32,7 @@ VadereModelTests/TestOSM/output/*
VadereModelTests/TestOSM_Group/output/* VadereModelTests/TestOSM_Group/output/*
VadereModelTests/TestSFM/output/* VadereModelTests/TestSFM/output/*
VadereModelTests/TestGNM/output/* VadereModelTests/TestGNM/output/*
VadereModelTests/TestBHM/output/*
VadereModelTests/TestOVM/output/* VadereModelTests/TestOVM/output/*
VadereModelTests/TestOSM/legacy/* VadereModelTests/TestOSM/legacy/*
VadereModelTests/TestOSM_Group/legacy/* VadereModelTests/TestOSM_Group/legacy/*
...@@ -52,7 +53,7 @@ VadereGui/output/ ...@@ -52,7 +53,7 @@ VadereGui/output/
#mac osx files #mac osx files
.DS_Store .DS_Store
#linux deskopt dotfiles #linux desktop dotfiles
**/.directory **/.directory
/VadereModelTests/TestStairs/output /VadereModelTests/TestStairs/output
/VadereModelTests/TestStairs/legacy /VadereModelTests/TestStairs/legacy
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Note: script contains some print statements so that progress can be tracked # Note: script contains some print statements so that progress can be tracked
# a little bit while script is running in continuous integration pipeline. # a little bit while script is running in continuous integration pipeline.
# Wach out: call this script from root directory of project. E.g. # Watch out: call this script from root directory of project. E.g.
# #
# python Tools/my_script.py # python Tools/my_script.py
...@@ -46,6 +46,7 @@ def run_scenario_files_with_vadere_console(scenario_files, vadere_console="Vader ...@@ -46,6 +46,7 @@ def run_scenario_files_with_vadere_console(scenario_files, vadere_console="Vader
failed_scenarios_with_exception = [] failed_scenarios_with_exception = []
for i, scenario_file in enumerate(scenario_files): for i, scenario_file in enumerate(scenario_files):
try: try:
print("Running scenario file ({}/{}): {}".format(i + 1, total_scenario_files, scenario_file)) print("Running scenario file ({}/{}): {}".format(i + 1, total_scenario_files, scenario_file))
...@@ -96,6 +97,7 @@ def print_summary(passed_and_failed_scenarios): ...@@ -96,6 +97,7 @@ def print_summary(passed_and_failed_scenarios):
print("Failed: {}".format(total_failed_scenarios)) print("Failed: {}".format(total_failed_scenarios))
if __name__ == "__main__": if __name__ == "__main__":
long_running_scenarios = [ long_running_scenarios = [
"basic_4_1_wall_gnm1", "basic_4_1_wall_gnm1",
"queueing", "queueing",
...@@ -103,8 +105,10 @@ if __name__ == "__main__": ...@@ -103,8 +105,10 @@ if __name__ == "__main__":
"rimea_11", "rimea_11",
"TestSFM", "TestSFM",
"thin_wall_and_closer_source_nelder_mead_ok", "thin_wall_and_closer_source_nelder_mead_ok",
"thin_wall_and_closer_source_pso_could_fail" "thin_wall_and_closer_source_pso_could_fail",
"rimea_04_flow_osm1_550_up",
] ]
excluded_scenarios = ["TESTOVM", "output", "legacy"] excluded_scenarios = ["TESTOVM", "output", "legacy"]
excluded_scenarios.extend(long_running_scenarios) excluded_scenarios.extend(long_running_scenarios)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment