Update tests from upstream

Author: sethrj

Examples/test-suite/argcargvtest.i

@@ -1,6 +1,6 @@
 %module argcargvtest
 
-#if !defined(SWIGCSHARP) && !defined(SWIGD) && !defined(SWIGGO) && !defined(SWIGGUILE) && !defined(SWIGJAVA) && !defined(SWIGJAVASCRIPT) && !defined(SWIGMZSCHEME) && !defined(SWIGOCAML) && !defined(SWIGR) && !defined(SWIGSCILAB)
+#if !defined(SWIGCSHARP) && !defined(SWIGD) && !defined(SWIGFORTRAN) && !defined(SWIGGO) && !defined(SWIGGUILE) && !defined(SWIGJAVA) && !defined(SWIGJAVASCRIPT) && !defined(SWIGMZSCHEME) && !defined(SWIGOCAML) && !defined(SWIGR) && !defined(SWIGSCILAB)
 %include <argcargv.i>
 
 %apply (int ARGC, char **ARGV) { (size_t argc, const char **argv) }

Examples/test-suite/common.mk

@@ -224,7 +224,6 @@ CPP_TEST_CASES += \
 	disown \
 	dynamic_cast \
 	empty \
-	enum_callback \
 	enum_ignore \
 	enum_plus \
 	enum_rename \

Examples/test-suite/cpp_basic.i

@@ -24,11 +24,11 @@ class Foo {
     int func1(int a) {
       return 2*a*num;
     }
-
+    
     int func2(int a) {
       return -a*num;
     }
-
+    
     int (Foo::*func_ptr)(int);
 
     const char* __str__() const { return "Foo"; }
@@ -58,7 +58,7 @@ static Foo init_ref = Foo(-4);
 class Bar {
   public:
     Bar() : fptr(0), fref(init_ref), fval(15) , cint(3) {}
-
+  
     Foo *fptr;
     Foo &fref;
     Foo fval;

Examples/test-suite/enum_callback.i

@@ -21,6 +21,7 @@ top_srcdir   = @top_srcdir@
 top_builddir = @top_builddir@
 
 CPP_TEST_CASES = \
+	complextest \
 	fortran_bindc \
 	fortran_callback \
 	fortran_naming \
@@ -29,7 +30,6 @@ CPP_TEST_CASES = \
 	fortran_std_span \
 	fortran_subroutine \
 	li_std_set \
-	complextest \
 
 C_TEST_CASES = \
 	fortran_array_typemap \
@@ -39,72 +39,76 @@ C_TEST_CASES = \
 	ccomplextest \
 
 FAILING_CPP_TESTS += \
-	contract \
-	global_scope_types \
-	grouping \
-	member_funcptr_galore \
-	member_pointer \
-	member_pointer_const \
-	namespace_class \
-	nested_scope_flat \
-	overload_arrays \
-	overload_complicated \
-	overload_return_type \
-	overload_simple \
-	overload_subtype \
-	smart_pointer_member \
-	smart_pointer_template_defaults_overload \
-	typedef_classforward_same_name \
-	cpp11_result_of \
-	cpp11_rvalue_reference2 \
-	cpp11_rvalue_reference3 \
-	cpp11_default_delete \
 	allprotected \
-	apply_strings \
 	apply_signed_char \
+	apply_strings \
+	contract \
 	director_abstract \
-	director_binary_string \
-	director_classic \
 	director_basic \
-	director_default \
-	director_detect \
+	director_binary_string \
 	director_classes \
+	director_classic \
 	director_comparison_operators \
 	director_conversion_operators \
+	director_default \
+	director_detect \
+	director_enum \
+	director_exception \
 	director_exception_catches \
 	director_exception_nothrow \
-	director_exception \
-	director_enum \
+	director_extend \
 	director_frob \
+	director_ignore \
+	director_keywords \
+	director_namespace_clash \
 	director_nested \
-	director_extend \
-	director_nspace_director_name_collision \
 	director_nspace \
-	director_keywords \
+	director_nspace_director_name_collision \
 	director_overload \
-	director_namespace_clash \
-	director_pass_by_value \
-	director_ignore \
+	director_overload2 \
 	director_ownership \
+	director_pass_by_value \
+	director_primitives \
+	director_property \
 	director_protected \
+	director_protected_overloaded \
+	director_redefined \
 	director_ref \
-	director_property \
-	director_primitives \
 	director_smartptr \
+	director_string \
 	director_unroll \
-	director_overload2 \
-	director_protected_overloaded \
 	director_using \
-	director_redefined \
-	director_wombat \
+	director_using_member_scopes \
 	director_void \
+	director_wombat \
+	global_scope_types \
+	grouping \
 	li_boost_shared_ptr_director \
+	member_funcptr_galore \
+	member_pointer \
+	member_pointer_const \
+	namespace_class \
 	nested_directors \
+	nested_scope_flat \
+	overload_arrays \
+	overload_complicated \
+	overload_return_type \
+	overload_simple \
+	overload_subtype \
+	smart_pointer_member \
+	smart_pointer_template_defaults_overload \
+	typedef_classforward_same_name \
 	typemap_directorout \
-	director_string \
+	using_member_scopes \
+
+FAILING_CPP_TESTS += \
+	cpp11_default_delete \
 	cpp11_director_enums \
 	cpp11_directors \
 	cpp11_function_objects \
+	cpp11_result_of \
+	cpp11_rvalue_reference2 \
+	cpp11_rvalue_reference3 \
 
 FAILING_C_TESTS += \
 	char_constant \

Examples/test-suite/fortran/Makefile.in

@@ -0,0 +1,35 @@
+! File : constructor_copy_runme.F90
+
+#include "fassert.h"
+
+program constructor_copy_runme
+  implicit none
+
+  call test_assignment
+
+contains
+
+subroutine test_assignment
+  use constructor_copy
+  use ISO_C_BINDING
+  implicit none
+  type(Bari) :: a, b, c
+
+  ASSERT(.not. c_associated(a%swigdata%cptr))
+  ASSERT(a%swigdata%cmemflags == 0)
+
+  ! Create
+  a = Bari(123)
+  ASSERT(a%get_x() == 123)
+  ! Copy
+  b = Bari(a)
+  ! Value should be same, but pointers should not
+  ASSERT(b%get_x() == 123)
+  ASSERT(.not. c_associated(a%swigdata%cptr, b%swigdata%cptr))
+
+  call b%release()
+  call a%release()
+end subroutine
+
+end program
+

Examples/test-suite/fortran/constructor_copy_runme.F90

@@ -3,12 +3,9 @@
 #include "fassert.h"
 
 program cpp_basic_runme
-  use cpp_basic
-  use ISO_C_BINDING
   implicit none
 
   call test_ownership
-  call test_assignment
 
 contains
 subroutine test_ownership
@@ -57,32 +54,5 @@ subroutine test_ownership
   ASSERT(c%swigdata%cmemflags == 0)
 
 end subroutine
-
-subroutine test_assignment
-  use cpp_basic
-  use ISO_C_BINDING
-  implicit none
-  type(Foo) :: a, b, c
-
-  ASSERT(.not. c_associated(a%swigdata%cptr))
-  ASSERT(a%swigdata%cmemflags == 0)
-
-  ! Create
-  a = Foo(123)
-  ASSERT(a%func1(3) == 2 * 3 * 123)
-  ! Copy
-  b = Foo(a)
-  ! Value should be same, but pointers should not
-  ASSERT(b%func1(3) == 2 * 3 * 123)
-  ASSERT(.not. c_associated(a%swigdata%cptr, b%swigdata%cptr))
-
-  ! Get reference to b, then release b
-  c = get_reference(b)
-  call b%release()
-  ! 'c' is a reference to deleted data, but it shouldn't crash when we clear it
-  call c%release()
-  ! Release 'a's memory
-  call a%release()
-end subroutine
 end program