Remove cache on interactor change

Author: MasloMaslane

src/sinol_make/commands/run/__init__.py

@@ -354,17 +354,17 @@ def get_groups(self, tests):
         return sorted(list(set([self.get_group(test) for test in tests])))
 
 
-    def compile_solutions(self, solutions, is_checker=False):
+    def compile_solutions(self, solutions, remove_all_cache=False):
         os.makedirs(paths.get_compilation_log_path(), exist_ok=True)
         os.makedirs(paths.get_executables_path(), exist_ok=True)
         print("Compiling %d solutions..." % len(solutions))
-        args = [(solution, True, is_checker) for solution in solutions]
+        args = [(solution, True, remove_all_cache) for solution in solutions]
         with mp.Pool(self.cpus) as pool:
             compilation_results = pool.starmap(self.compile, args)
         return compilation_results
 
 
-    def compile(self, solution, use_extras = False, is_checker = False):
+    def compile(self, solution, use_extras=False, remove_all_cache=False):
         os.makedirs(paths.get_compilation_log_path(), exist_ok=True)
         os.makedirs(paths.get_executables_path(), exist_ok=True)
         compile_log_file = paths.get_compilation_log_path("%s.compile_log" % package_util.get_file_name(solution))
@@ -387,7 +387,7 @@ def compile(self, solution, use_extras = False, is_checker = False):
         try:
             with open(compile_log_file, "w") as compile_log:
                 compile.compile(source_file, output, self.compilers, compile_log, self.args.compile_mode,
-                                extra_compilation_args, extra_compilation_files, is_checker=is_checker)
+                                extra_compilation_args, extra_compilation_files, remove_all_cache=remove_all_cache)
             print(util.info("Compilation of file %s was successful."
                             % package_util.get_file_name(solution)))
             return True
@@ -1177,7 +1177,7 @@ def compile_checker(self):
         checker_basename = os.path.basename(self.checker)
         self.checker_executable = paths.get_executables_path(checker_basename + ".e")
 
-        checker_compilation = self.compile_solutions([self.checker], is_checker=True)
+        checker_compilation = self.compile_solutions([self.checker], remove_all_cache=True)
         if not checker_compilation[0]:
             util.exit_with_error('Checker compilation failed.')
 

src/sinol_make/helpers/cache.py

@@ -53,19 +53,19 @@ def check_compiled(file_path: str, compilation_flags: str, sanitizers: bool) ->
         return None
 
 
-def save_compiled(file_path: str, exe_path: str, compilation_flags: str, sanitizers: bool, is_checker: bool = False):
+def save_compiled(file_path: str, exe_path: str, compilation_flags: str, sanitizers: bool, remove_all_cache: bool = False):
     """
     Save the compiled executable path to cache in `.cache/md5sums/<basename of file_path>`,
     which contains the md5sum of the file and the path to the executable.
     :param file_path: Path to the file
     :param exe_path: Path to the compiled executable
     :param compilation_flags: Compilation flags used
     :param sanitizers: Whether -fsanitize=undefined,address was used
-    :param is_checker: Whether the compiled file is a checker. If True, all cached tests are removed.
+    :param remove_all_cache: Whether to remove all cached files. If True, all cached tests are removed.
     """
     info = CacheFile(util.get_file_md5(file_path), exe_path, compilation_flags, sanitizers)
     info.save(file_path)
-    if is_checker:
+    if remove_all_cache:
         remove_results_cache()
 
 

src/sinol_make/helpers/compile.py

@@ -14,7 +14,7 @@
 
 
 def compile(program, output, compilers: Compilers = None, compile_log=None, compilation_flags='default',
-            extra_compilation_args=None, extra_compilation_files=None, is_checker=False, use_fsanitize=False):
+            extra_compilation_args=None, extra_compilation_files=None, remove_all_cache=False, use_fsanitize=False):
     """
     Compile a program.
     :param program: Path to the program to compile
@@ -24,7 +24,7 @@ def compile(program, output, compilers: Compilers = None, compile_log=None, comp
     :param compilation_flags: Group of compilation flags to use
     :param extra_compilation_args: Extra compilation arguments
     :param extra_compilation_files: Extra compilation files
-    :param is_checker: Set to True if compiling a checker. This will remove all cached test results.
+    :param remove_all_cache: Set to True if you want to remove all cached test results.
     :param use_fsanitize: Whether to use fsanitize when compiling C/C++ programs. Sanitizes address and undefined behavior.
     """
     if extra_compilation_args is None:
@@ -114,7 +114,7 @@ def compile(program, output, compilers: Compilers = None, compile_log=None, comp
     if process.returncode != 0:
         raise CompilationError('Compilation failed')
     else:
-        save_compiled(program, output, compilation_flags, use_fsanitize, is_checker)
+        save_compiled(program, output, compilation_flags, use_fsanitize, remove_all_cache)
         return True
 
 

src/sinol_make/task_type/interactive_io.py

@@ -24,7 +24,7 @@ def get_files_to_compile(self):
         if interactors:
             self.interactor = interactors[0]
             self.interactor_exe = paths.get_executables_path(package_util.get_executable(self.interactor))
-            return [("interactor", [self.interactor], {})]
+            return [("interactor", [self.interactor], {'remove_all_cache': True})]
 
     def _get_interactor_result_file(self, sol_result_file_path: str):
         dirname = os.path.dirname(sol_result_file_path)

src/sinol_make/task_type/normal.py

@@ -38,7 +38,7 @@ def get_files_to_compile(self):
             self.checker = checkers[0]
             self._check_had_checker(True)
             self.checker_exe = paths.get_executables_path(package_util.get_executable(self.checker))
-            return [("checker", [self.checker], {"is_checker": True})]
+            return [("checker", [self.checker], {"remove_all_cache": True})]
         else:
             self._has_checker = False
             self._check_had_checker(False)

tests/commands/run/test_integration.py

@@ -339,8 +339,8 @@ def test_missing_output_files(capsys, create_package):
     assert 'There are tests without outputs.' in out
     assert 'Run outgen to fix this issue or add the --no-outputs flag to ignore the issue.' in out
     assert 'An error occurred while running the command.' not in out
-    
-    
+
+
 @pytest.mark.parametrize("create_package", [get_simple_package_path(), get_verify_status_package_path()], indirect=True)
 def test_missing_output_files_allow_missing(capsys, create_package):
     """
@@ -680,7 +680,7 @@ def test_results_caching_checker_changed(create_package, time_tool):
         f.write("// Changed checker source code.\n" + checker_source)
 
     # Compile checker check if test results are removed.
-    command.compile_additional_files([("checker", ["chkchk.cpp"], {"is_checker": True})])
+    command.compile_additional_files([("checker", ["chkchk.cpp"], {"remove_all_cache": True})])
     task_id = package_util.get_task_id()
     solutions = package_util.get_solutions(task_id, None)
     for solution in solutions:

tests/helpers/test_cache.py

@@ -81,7 +81,7 @@ def test_cache():
         cache_file.save("abc.cpp")
         assert cache.get_cache_file("abc.cpp") == cache_file
         cache.save_compiled("abc.cpp", "abc.e", "default", False,
-                            is_checker=True)
+                            remove_all_cache=True)
         assert cache.get_cache_file("abc.cpp").tests == {}
 
         # Test that cache is cleared when extra compilation files change