enlist failing tests and add few missing typemaps

3 files changed, 171 insertions, 3 deletions

diff --git a/Examples/test-suite/hhvm/Makefile.in b/Examples/test-suite/hhvm/Makefile.in
index 6e60f416d..eec626121 100644
--- a/Examples/test-suite/hhvm/Makefile.in
+++ b/Examples/test-suite/hhvm/Makefile.in
@@ -11,6 +11,167 @@ top_builddir = ../@top_builddir@
 OBJEXT = @OBJEXT@
 SO = @SO@
 
+FAILING_C_TESTS +=          \
+    c_delete                \
+    arrays                  \
+    enums                   \
+    function_typedef        \
+    funcptr                 \
+    integers                \
+    lextype                 \
+    li_cdata                \
+    li_cmalloc              \
+    li_constraints          \
+    long_long               \
+    nested                  \
+    nested_structs          \
+    nested_extend_c         \
+    overload_extend_c       \
+    preproc_include         \
+    typemap_subst           \
+    typedef_struct          \
+
+FAILING_CPP_TESTS =         \
+    aggregate               \
+    allowexcept             \
+    apply_signed_char       \
+    apply_strings           \
+    allprotected            \
+    arrayref                \
+    arrays_dimensionless    \
+    array_member            \
+    array_typedef_memberin  \
+    arrays_global           \
+    arrays_global_twodim    \
+    autodoc                 \
+    catches                 \
+    char_strings            \
+    class_scope_weird       \
+    constructor_copy        \
+    constant_pointers       \
+    contract                \
+    cpp_basic               \
+    default_constructor     \
+    defvalue_constructor    \
+    destructor_reprotected  \
+    director_basic          \
+    default_target          \
+    director_classes        \
+    director_classic        \
+    director_frob           \
+    director_primitives     \
+    director_overload       \
+    director_ref            \
+    director_unroll         \
+    director_using          \
+    dynamic_cast            \
+    exception_order         \
+    extend_placement        \
+    extern_c                \
+    features                \
+    friends                 \
+    friends_template        \
+    funcptr_cpp             \
+    global_scope_types      \
+    grouping                \
+    ignore_parameter        \
+    import_nomodule         \
+    kind                    \
+    langobj                 \
+    kwargs_feature          \
+    li_cdata_cpp            \
+    li_stdint               \
+    li_swigtype_inout       \
+    li_typemaps             \
+    li_typemaps_apply       \
+    long_long_apply         \
+    li_windows              \
+    member_funcptr_galore   \
+    member_pointer          \
+    mixed_types             \
+    multiple_inheritance_interfaces \
+    namespace_spaces        \
+    naturalvar              \
+    operator_overload       \
+    operator_overload_break \
+    overload_copy           \
+    overload_method         \
+    overload_polymorphic    \
+    overload_rename         \
+    overload_template       \
+    overload_simple         \
+    overload_template_fast  \
+    pointer_reference       \
+    primitive_ref           \
+    redefined               \
+    refcount                \
+    reference_global_vars   \
+    rename1                 \
+    rename2                 \
+    rename3                 \
+    rename4                 \
+    register_par            \
+    rename_scope            \
+    return_const_value      \
+    smart_pointer_const     \
+    smart_pointer_const2    \
+    smart_pointer_const_overload    \
+    smart_pointer_extend    \
+    smart_pointer_member    \
+    smart_pointer_multi     \
+    smart_pointer_multi_typedef \
+    smart_pointer_namespace     \
+    smart_pointer_namespace2    \
+    smart_pointer_overload  \
+    smart_pointer_protected \
+    smart_pointer_simple    \
+    smart_pointer_template_const_overload   \
+    smart_pointer_templatemethods   \
+    smart_pointer_typedef   \
+    special_variable_macros \
+    template_basic          \
+    template_default_arg    \
+    template_default_arg_overloaded_extend  \
+    template_default_class_parms_typedef    \
+    template_explicit       \
+    template_extend_overload    \
+    template_ns             \
+    template_template_parameters    \
+    template_typedef_cplx2  \
+    template_typedef_cplx3  \
+    template_typedef_cplx4  \
+    template_typemaps       \
+    typedef_array_member    \
+    typedef_funcptr         \
+    typedef_sizet           \
+    typedef_struct_cpp      \
+    typemap_array_qualifiers    \
+    typemap_out_optimal     \
+    typemap_variables       \
+    typemap_various         \
+    using_protected         \
+    varargs                 \
+    varargs_overload        \
+    valuewrapper            \
+    virtual_poly            \
+    valuewrapper_opaque     \
+    virtual_destructor      \
+    virtual_poly            \
+    li_std_combinations     \
+    voidtest                \
+    li_std_except           \
+    wrapmacro               \
+    li_std_map              \
+    li_std_pair_using       \
+
+FAILING_MULTI_CPP_TEST =    \
+    import_stl_a            \
+    clientdata_prop         \
+    imports                 \
+    packageoption           \
+    template_typedef_import \
+    mod                     \
+
 include $(srcdir)/../common.mk
 
 # Overridden variables here
diff --git a/Examples/test-suite/hhvm/config.cmake b/Examples/test-suite/hhvm/config.cmake
index 021852e91..07c5ae95c 100644
--- a/Examples/test-suite/hhvm/config.cmake
+++ b/Examples/test-suite/hhvm/config.cmake
@@ -1,4 +1,4 @@
-file(GLOB ext_SRC *.cxx *.cpp *.c)
+file(GLOB ext_SRC "*.cxx" "*.cpp" "*.c")
 
 HHVM_EXTENSION($testcase ${ext_SRC})
 HHVM_SYSTEMLIB($testcase ../ext_$testcase.php)
diff --git a/Lib/hhvm/hhvm.swg b/Lib/hhvm/hhvm.swg
index 80d7f93ba..1bb0b0e0d 100644
--- a/Lib/hhvm/hhvm.swg
+++ b/Lib/hhvm/hhvm.swg
@@ -11,6 +11,7 @@
                    short,
                    unsigned short,
                    long,
+                   long long,
                    unsigned long,
                    unsigned char,
                    signed char,
@@ -18,7 +19,7 @@
   "KindOfInt64";
 
 %typemap(consttab) bool
-  "KindOfBoolean";
+  "KindOfBoolean";t
 
 %typemap(consttab) float,
                    double
@@ -39,6 +40,7 @@
                   short,
                   unsigned short,
                   long,
+                  long long,
                   unsigned long,
                   unsigned char,
                   signed char,
@@ -78,6 +80,7 @@
                   short,
                   unsigned short,
                   long,
+                  long long,
                   unsigned long,
                   unsigned char,
                   signed char,
@@ -115,7 +118,8 @@
 
 /* in typemap */
 
-%typemap(in) short, 
+%typemap(in) bool,
+             short, 
              unsigned short, 
              int, 
              unsigned int, 
@@ -161,6 +165,7 @@
               short,
               unsigned short,
               long,
+              long long,
               unsigned long,
               unsigned char,
               signed char, 
@@ -219,6 +224,7 @@
                     short,
                     unsigned short,
                     long,
+                    long long,
                     unsigned long,
                     unsigned char,
                     signed char,
@@ -314,6 +320,7 @@ bool, const bool &
                   short,
                   unsigned short,
                   long,
+                  long long,
                   unsigned long,
                   unsigned char,
                   signed char,