Add flag to exit on failed compilation (#50)

* Add --ignore-compilation-errors flag

* Fix tests and add tests for the new flag

* Change default behaviour of run and fix tests

* Remove exit_on_compilation_error flag

* Fix tests

* Remove "no solutions were compiled" if

* Update error exit message

Co-authored-by: Tomasz Nowak <[email protected]>

* Fix exit message

* Refactor compilation results

---------

Co-authored-by: Tomasz Nowak <[email protected]>

Author: MasloMaslane

src/sinol_make/commands/run/__init__.py

@@ -161,8 +161,6 @@ def compile_solutions(self, solutions):
         print("Compiling %d solutions..." % len(solutions))
         with mp.Pool(self.cpus) as pool:
             compilation_results = pool.map(self.compile, solutions)
-        if not all(compilation_results):
-            util.exit_with_error("\nCompilation failed.")
         return compilation_results
 
 
@@ -473,12 +471,20 @@ def calculate_points(self, results):
 
     def compile_and_run(self, solutions):
         compilation_results = self.compile_solutions(solutions)
+        compiled_solutions = []
+        for i in range(len(solutions)):
+            if compilation_results[i]:
+                compiled_solutions.append(solutions[i])
+            else:
+                self.failed_compilations.append(solutions[i])
+        compilation_results = [result for result in compilation_results if result]
+
         os.makedirs(self.EXECUTIONS_DIR, exist_ok=True)
         executables = [os.path.join(self.EXECUTABLES_DIR, package_util.get_executable(solution))
-                       for solution in solutions]
-        compiled_commands = zip(solutions, executables, compilation_results)
-        names = solutions
-        return self.run_solutions(compiled_commands, names, solutions, self.args.solutions_report)
+                       for solution in compiled_solutions]
+        compiled_commands = zip(compiled_solutions, executables, compilation_results)
+        names = compiled_solutions
+        return self.run_solutions(compiled_commands, names, compiled_solutions, self.args.solutions_report)
 
 
     def print_expected_scores(self, expected_scores):
@@ -499,6 +505,11 @@ def validate_expected_scores(self, results):
         used_solutions = results.keys()
         if self.args.solutions == None and config_expected_scores: # If no solutions were specified, use all solutions from config
             used_solutions = config_expected_scores.keys()
+        used_solutions = list(used_solutions)
+
+        for solution in self.failed_compilations:
+            if solution in used_solutions:
+                used_solutions.remove(solution)
 
         used_groups = set()
         if self.args.tests == None and config_expected_scores: # If no groups were specified, use all groups from config
@@ -660,6 +671,11 @@ def validate_arguments(self, args):
 
         return compilers, timetool_path
 
+    def exit(self):
+        if len(self.failed_compilations) > 0:
+            util.exit_with_error('Compilation failed for {cnt} solution{letter}.'.format(
+                cnt=len(self.failed_compilations), letter='' if len(self.failed_compilations) == 1 else 's'))
+
     def set_scores(self):
         self.tests = package_util.get_tests(self.args.tests)
         self.groups = list(sorted(set([self.get_group(test) for test in self.tests])))
@@ -750,7 +766,9 @@ def run(self, args):
         else:
             print(util.warning('There are no tests to run.'))
 
+        self.failed_compilations = []
         solutions = self.get_solutions(self.args.solutions)
         results = self.compile_and_run(solutions)
         validation_results = self.validate_expected_scores(results)
         self.print_expected_scores_diff(validation_results)
+        self.exit()

tests/commands/run/test_unit.py

@@ -41,7 +41,7 @@ def test_compile_solutions(create_package):
 def test_execution(create_package, time_tool):
     package_path = create_package
     command = get_command(package_path)
-    command.args = argparse.Namespace(time_tool=time_tool, weak_compilation_flags=False)
+    command.args.time_tool = time_tool
     solution = "abc.cpp"
     executable = package_util.get_executable(solution)
     result = command.compile_solutions([solution])

tests/commands/run/util.py

@@ -25,11 +25,12 @@ def get_command(path = None):
         java_compiler_path=compiler.get_java_compiler_path()
     )
     command.config = yaml.load(open(os.path.join(path, "config.yml"), "r"), Loader=yaml.FullLoader)
+    command.failed_compilations = []
     set_default_args(command)
     return command
 
 
 def set_default_args(command):
     command.args = argparse.Namespace(
-        weak_compilation_flags=False
+        weak_compilation_flags=False,
     )