Fixed issue where allTests.py --e5 option wasn't recognized on platforms where nodeJS isn't installed (fixes #442)

1 files changed, 6 insertions, 11 deletions

diff --git a/scripts/Component.py b/scripts/Component.py
index 18c19cd051b..4bddbd0889f 100644
--- a/scripts/Component.py
+++ b/scripts/Component.py
@@ -225,28 +225,23 @@ for m in filter(lambda x: os.path.isdir(os.path.join(toplevel, x)), os.listdir(t
     elif m == "python" or re.match("python-.*", m):
         Mapping.add(m, PythonMapping(), component)
     elif m == "ruby" or re.match("ruby-.*", m):
-        Mapping.add(m, RubyMapping(), component)
+        Mapping.add(m, RubyMapping(), component, enable=not isinstance(platform, Windows))
     elif m == "php" or re.match("php-.*", m):
         Mapping.add(m, PhpMapping(), component)
     elif m == "js" or re.match("js-.*", m):
-        if platform.hasNodeJS():
-            Mapping.add(m, JavaScriptMapping(), component)
-            Mapping.add("typescript", TypeScriptMapping(), component, "js")
+        Mapping.add(m, JavaScriptMapping(), component, enable=platform.hasNodeJS())
+        Mapping.add("typescript", TypeScriptMapping(), component, "js", enable=platform.hasNodeJS())
     elif m == "objective-c" or re.match("objective-c-*", m):
         Mapping.add(m, ObjCMapping(), component)
     elif m == "csharp" or re.match("charp-.*", m):
-        Mapping.add("csharp", CSharpMapping(), component)
+        Mapping.add("csharp", CSharpMapping(), component, enable=isinstance(platform, Windows) or platform.hasDotNet())
 
 if isinstance(platform, Windows):
     # Windows doesn't support all the mappings, we take them out here.
-    Mapping.remove("ruby")
     if platform.getCompiler() != "v140":
-        Mapping.remove("python")
+        Mapping.disable("python")
     if platform.getCompiler() not in ["v140", "v141"]:
-        Mapping.remove("php")
-elif not platform.hasDotNet():
-    # Remove C# if Dot Net Core isn't supported
-    Mapping.remove("csharp")
+        Mapping.disable("php")
 
 #
 # Check if Matlab is installed and eventually add the Matlab mapping