From a93704f19bfd269eb9b1832167f98a7e26b093ba Mon Sep 17 00:00:00 2001
From: Andrew Hamilton <and_hamilton@yahoo.com>
Date: Thu, 27 Oct 2016 14:03:44 +0200
Subject: [PATCH] Disabling perl6 because of problems when running it.

---
 BUGS          |  3 ++-
 tools.py      | 18 ++++++++++--------
 tools_test.py |  9 +++++----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/BUGS b/BUGS
index 5bd87c4..c0a8a46 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,4 @@
 Current
-- When pausing, often getting a ProcessLookupError.
 - Within the sandbox sudo is not working for tools.
   <- Sudo is working now but its always asking for a password.
 - When paging the summary window, with the bottom scroll bar showing, the
@@ -234,6 +233,8 @@ Fixed
 - Some results are always missing their contents and are showing "?".
   e.g. golden-files/results/uncrustify-hello_c <- contents and metadata
 - The tests fail when run in gnome-terminal.
+- When pausing, often getting a ProcessLookupError.
+  <- Somehow the worker was dying when running perl6. Revisiting this later.
 
 
 Won't fix
diff --git a/tools.py b/tools.py
index 771d654..616b5b2 100644
--- a/tools.py
+++ b/tools.py
@@ -459,13 +459,15 @@ bandit.dependencies = {"python-bandit", "python3-bandit"}
 
 
 def _perl_version(path):
-    stdout, stderr, returncode = _do_command(["perl", "-c", path])
-    return "perl6" if "Perl v6.0.0 required" in stderr else "perl"
+    # stdout, stderr, returncode = _do_command(["perl", "-c", path])
+    # return "perl6" if "Perl v6.0.0 required" in stderr else "perl"
+    return "perl"
 
 
 def perl_syntax(path):
     return _run_command([_perl_version(path), "-c", path])
-perl_syntax.dependencies = {"perl", "rakudo"}
+# perl_syntax.dependencies = {"perl", "rakudo"}
+perl_syntax.dependencies = {"perl"}
 
 
 def perldoc(path):
@@ -481,9 +483,9 @@ def perltidy(path):
 perltidy.dependencies = {"perltidy"}
 
 
-def perl6_syntax(path):
-    return _run_command(["perl6", "-c", path])
-perl6_syntax.dependencies = {"rakudo"}
+# def perl6_syntax(path):
+#     return _run_command(["perl6", "-c", path])
+# perl6_syntax.dependencies = {"rakudo"}
 
 
 def splint(path):
@@ -710,8 +712,8 @@ def _tools_for_extension():
         "pl": [perl_syntax, perldoc, perltidy],
         "pm": [perl_syntax, perldoc, perltidy],
         "t": [perl_syntax, perldoc, perltidy],
-        "p6": [perl6_syntax, perldoc],
-        "pm6": [perl6_syntax, perldoc],
+        # "p6": [perl6_syntax, perldoc],
+        # "pm6": [perl6_syntax, perldoc],
         "pod": [perldoc],
         "pod6": [perldoc],
         "java": [uncrustify],
diff --git a/tools_test.py b/tools_test.py
index 3b25dd4..21377c6 100755
--- a/tools_test.py
+++ b/tools_test.py
@@ -128,7 +128,8 @@ class ToolsTestCase(unittest.TestCase):
     def test_perl_syntax(self):
         self._test_tool(tools.perl_syntax,
                         [("perl.pl", tools.Status.ok),
-                         ("perl6.pl", tools.Status.problem)])
+                         # ("perl6.pl", tools.Status.problem)
+                        ])
 
     def test_perldoc(self):
         self._test_tool(tools.perldoc,
@@ -138,9 +139,9 @@ class ToolsTestCase(unittest.TestCase):
     def test_perltidy(self):
         self._test_tool(tools.perltidy, [("perl.pl", tools.Status.normal)])
 
-    def test_perl6_syntax(self):
-        self._test_tool(tools.perl6_syntax,
-                        [("perl6.p6", tools.Status.problem)])
+    # def test_perl6_syntax(self):
+    #     self._test_tool(tools.perl6_syntax,
+    #                     [("perl6.p6", tools.Status.problem)])
 
     def test_uncrustify(self):
         self._test_tool(tools.uncrustify,