Fixes #4316. --disable: should accept gem as alias for gems.

jruby · Nov 17, 2016 · e01d2b5 · e01d2b5
1 parent c49d1f4
commit e01d2b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java b/core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
@@ -817,6 +817,12 @@ public Boolean apply(ArgumentProcessor processor, Boolean enable) {
                 return true;
             }
         });
+        features.put("gem", new Function2<Boolean, ArgumentProcessor, Boolean>() {
+            public Boolean apply(ArgumentProcessor processor, Boolean enable) {
+                processor.config.setDisableGems(!enable);
+                return true;
+            }
+        });
         features.put("gems", new Function2<Boolean, ArgumentProcessor, Boolean>() {
             public Boolean apply(ArgumentProcessor processor, Boolean enable) {
                 processor.config.setDisableGems(!enable);

diff --git a/test/mri/excludes/TestSyntax.rb b/test/mri/excludes/TestSyntax.rb
@@ -12,8 +12,6 @@
 exclude :test_integer_suffix, "needs investigation"
 exclude :test_invalid_next, "needs investigation"
 exclude :test_null_range_cmdarg, "needs investigation"
-exclude :test_syntax_ext, "needs investigation #4308"
-exclude :test_syntax_lib, "needs investigation #4308"
-exclude :test_syntax_sample, "needs investigation #4308"
-exclude :test_syntax_test, "needs investigation #4308"
+
+