fixed tests for latest versioning

[git-p4: depot-paths = "//src/ruby_to_c/dev/": change = 10513]
seattlerb · Feb 3, 2016 · 1f8bf0e · 1f8bf0e
1 parent 74552dc
commit 1f8bf0e
Showing 1 changed file with 58 additions and 55 deletions.
diff --git a/test/r2ctestcase.rb b/test/r2ctestcase.rb
@@ -9,7 +9,7 @@
 class R2CTestCase < ParseTreeTestCase
 
   def self.add_skipped_tests *names
-    names.each do |name|
+    names.flatten.each do |name|
       add_tests(name,
                 "Rewriter"    => :same,
                 "TypeChecker" => :skip,
@@ -19,6 +19,10 @@ def self.add_skipped_tests *names
     end
   end
 
+  def self.add_skipped_tests19 *names
+    add_skipped_tests names.map { |s| "#{s}__19_20_21_22_23" }
+  end
+
   testcase_order.push(*%w(Ruby ParseTree Rewriter TypeChecker
                           CRewriter RubyToAnsiC RubyToRubyC))
 
@@ -1233,59 +1237,58 @@ def self.add_skipped_tests *names
                     "yield_array_1",
                     "yield_array_n",
                     "yield_n",
-                    "zsuper",
-
-                    # new entries, or did I screw something up?
-                    "array_bare_hash__19_20_21_22",
-                    "array_bare_hash_labels__19_20_21_22",
-                    "call_arglist_norm_hash_colons__19_20_21_22",
-                    "call_arglist_trailing_comma__19_20_21_22",
-                    "call_bang__19_20_21_22",
-                    "call_bang_empty__19_20_21_22",
-                    "call_fonz__19_20_21_22",
-                    "call_fonz_cm__19_20_21_22",
-                    "call_not__19_20_21_22",
-                    "call_not_equal__19_20_21_22",
-                    "call_splat_mid__19_20_21_22",
-                    "defn_args_mand_opt_mand__19_20_21_22",
-                    "defn_args_mand_opt_splat_mand__19_20_21_22",
-                    "defn_args_opt_mand__19_20_21_22",
-                    "defn_args_opt_splat_mand__19_20_21_22",
-                    "defn_args_splat_mand__19_20_21_22",
-                    "defn_args_splat_middle__19_20_21_22",
-                    "fcall_arglist_hash_colons__19_20_21_22",
-                    "hash_new__19_20_21_22",
-                    "hash_new_no_space__19_20_21_22",
-                    "hash_new_with_keyword__19_20_21_22",
                     "if_args_no_space_symbol__18",
-                    "if_post_not__19_20_21_22",
-                    "if_pre_not__19_20_21_22",
-                    "label_in_bare_hash_in_array_in_ternary__19_20_21_22",
-                    "label_in_callargs_in_ternary__19_20_21_22",
-                    "not__19_20_21_22",
-                    "splat_fcall_middle__19_20_21_22",
-                    "stabby_args_0_no_parens__19_20_21_22",
-                    "stabby_args_0_no_parens_doend__19_20_21_22",
-                    "stabby_args_0_spacebar_broken__19_20_21_22",
-                    "stabby_args_1__19_20_21_22",
-                    "stabby_args_1_doend__19_20_21_22",
-                    "stabby_args_1_no_parens__19_20_21_22",
-                    "stabby_args_1_no_parens_doend__19_20_21_22",
-                    "stabby_args_2__19_20_21_22",
-                    "stabby_args_2_doend__19_20_21_22",
-                    "stabby_args_2_no_parens__19_20_21_22",
-                    "stabby_args_2_no_parens_doend__19_20_21_22",
-                    "stabby_args__19_20_21_22",
-                    "stabby_args_doend__19_20_21_22",
-                    "str_question_control__19_20_21_22",
-                    "str_question_escape__19_20_21_22",
-                    "str_question_literal__19_20_21_22",
-                    "unless_post_not__19_20_21_22",
-                    "unless_pre_not__19_20_21_22",
-                    "until_post_not__19_20_21_22",
-                    "until_pre_not__19_20_21_22",
-                    "until_pre_not_mod__19_20_21_22",
-                    "while_post_not__19_20_21_22",
-                    "while_pre_not__19_20_21_22",
-                    "while_pre_not_mod__19_20_21_22")
+                    "zsuper")
+
+  add_skipped_tests19("array_bare_hash",
+                      "array_bare_hash_labels",
+                      "call_arglist_norm_hash_colons",
+                      "call_arglist_trailing_comma",
+                      "call_bang",
+                      "call_bang_empty",
+                      "call_fonz",
+                      "call_fonz_cm",
+                      "call_not",
+                      "call_not_equal",
+                      "call_splat_mid",
+                      "defn_args_mand_opt_mand",
+                      "defn_args_mand_opt_splat_mand",
+                      "defn_args_opt_mand",
+                      "defn_args_opt_splat_mand",
+                      "defn_args_splat_mand",
+                      "defn_args_splat_middle",
+                      "fcall_arglist_hash_colons",
+                      "hash_new",
+                      "hash_new_no_space",
+                      "hash_new_with_keyword",
+                      "if_post_not",
+                      "if_pre_not",
+                      "label_in_bare_hash_in_array_in_ternary",
+                      "label_in_callargs_in_ternary",
+                      "not",
+                      "splat_fcall_middle",
+                      "stabby_args_0_no_parens",
+                      "stabby_args_0_no_parens_doend",
+                      "stabby_args_0_spacebar_broken",
+                      "stabby_args_1",
+                      "stabby_args_1_doend",
+                      "stabby_args_1_no_parens",
+                      "stabby_args_1_no_parens_doend",
+                      "stabby_args_2",
+                      "stabby_args_2_doend",
+                      "stabby_args_2_no_parens",
+                      "stabby_args_2_no_parens_doend",
+                      "stabby_args",
+                      "stabby_args_doend",
+                      "str_question_control",
+                      "str_question_escape",
+                      "str_question_literal",
+                      "unless_post_not",
+                      "unless_pre_not",
+                      "until_post_not",
+                      "until_pre_not",
+                      "until_pre_not_mod",
+                      "while_post_not",
+                      "while_pre_not",
+                      "while_pre_not_mod")
 end