add .exe suffix to retdec-decompiler tool on windows

Author: PeterMatula

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog
 
+* 2020-06-04: Change: use `retdec-decompiler[.exe]` instead of `retdec-decompiler.py`.
 * 2020-04-08: Change: Removed support for the following features that are no longer useful: storing results into a database, showing results on the web, sending email notifications, building of RetDec, resuming tests run, testing a specific commit.
 * 2019-09-04: Enhancement: Add support for skipping tests that compile output C files (either via config or via the `--skip-c-compilation-tests` parameter of `runner.py`).
 * 2019-03-11: Change: Removed mention of 32-bit Windows (it is no longer supported). Added a new requirement for Windows: 64-bit GCC compiler (package `mingw-w64-x86_64-gcc`).

regression_tests/cmd_runner.py

@@ -152,11 +152,11 @@ def __init__(self, **kwargs):
         # Python scripts need to be run with 'python' on Windows. Simply running the
         # script by its path doesn't work. That is, for example, instead of
         #
-        #     /path/to/retdec-decompiler.py
+        #     /path/to/script.py
         #
         # we need to run
         #
-        #     python /path/to/retdec-decompiler.py
+        #     python /path/to/script.py
         #
         if 'args' in kwargs and kwargs['args'] and kwargs['args'][0].endswith('.py'):
             kwargs['args'].insert(0, sys.executable)

regression_tests/tools/decompiler_runner.py

@@ -5,6 +5,7 @@
 from regression_tests.tools.decompiler import Decompiler
 from regression_tests.tools.tool_runner import ToolRunner
 from regression_tests.utils import overrides
+from regression_tests.utils.os import on_windows
 
 
 class DecompilerRunner(ToolRunner):
@@ -17,7 +18,7 @@ def _tool_class(self):
 
     @overrides(ToolRunner)
     def _get_tool_executable_name(self, tool_name):
-        return 'retdec-decompiler'
+        return 'retdec-decompiler' + ('.exe' if on_windows() else '')
 
     @overrides(ToolRunner)
     def _initialize_tool_dir_and_args(self, dir, args):

runner.py

@@ -76,7 +76,8 @@ def ensure_all_required_settings_are_set(config):
         print_error("'retdec_install_dir' in the [runner] section of config_local.ini "
                     "points to a non-existing directory")
         sys.exit(1)
-    elif not os.path.exists(os.path.join(retdec_install_dir, 'bin', 'retdec-decompiler')):
+    elif not (os.path.exists(os.path.join(retdec_install_dir, 'bin', 'retdec-decompiler'))
+            or os.path.exists(os.path.join(retdec_install_dir, 'bin', 'retdec-decompiler.exe'))):
         print_error("'retdec_install_dir' in the [runner] section of config_local.ini "
                     "does not seem to point to RetDec")
         sys.exit(1)

tests/tools/decompiler_runner_tests.py

@@ -11,6 +11,7 @@
 from regression_tests.tools.decompiler_arguments import DecompilerArguments
 from regression_tests.tools.decompiler_runner import DecompilerRunner
 from regression_tests.tools.tool_test_settings import ToolTestSettings
+from regression_tests.utils.os import on_windows
 
 
 class DecompilerRunnerTests(unittest.TestCase):
@@ -32,7 +33,7 @@ def test_tool_class_returns_decompilation(self):
     def test_get_tool_executable_name_returns_correct_name(self):
         self.assertEqual(
             self.decomp_runner._get_tool_executable_name('decompiler'),
-            'retdec-decompiler'
+            'retdec-decompiler.exe' if on_windows() else 'retdec-decompiler'
         )
 
     def test_initialize_tool_dir_and_args_just_returns_args_when_config_file_is_not_set(self):