Fix unit tests

Author: sethrj

Examples/test-suite/fortran/arrays_global_twodim_runme.F90

@@ -18,17 +18,19 @@ subroutine test_int_array
   integer(C_INT) :: cnt = 10
   integer(C_INT) :: x, y
   integer(C_INT), dimension(:,:), allocatable :: expected, actual
+  integer(C_INT), dimension(2) :: dims
 
+  dims = [get_ARRAY_LEN_Y(), get_ARRAY_LEN_X()]
   constintarray2d = get_array_const_i()
   intarray2d = get_array_i()
 
   call set_array_i(constintarray2d)
 
-  allocate(expected(ARRAY_LEN_Y, ARRAY_LEN_X))
-  allocate(actual(ARRAY_LEN_Y, ARRAY_LEN_X))
+  allocate(expected(dims(1), dims(2)))
+  allocate(actual(dims(1), dims(2)))
 
-  do x = 1, ARRAY_LEN_X
-    do y = 1, ARRAY_LEN_Y
+  do x = 1, dims(2)
+    do y = 1, dims(1)
       expected(y, x) = cnt
       cnt = cnt + 1
       actual(y, x) = get_2d_array(intarray2d, x - 1, y - 1)

Examples/test-suite/fortran/fortran_global_const_runme.F90

@@ -29,10 +29,10 @@ subroutine test_constants
   ASSERT(all(compiletime_floats == 1.23))
 
   allocate(runtime_ints(3), source= &
-    [nofortranconst_int_global, MACRO_INT, &
+    [get_nofortranconst_int_global(), MACRO_INT, &
     get_extern_const_int()])
   allocate(runtime_floats(2), source= &
-    [constant_float_global, nofortranconst_float_global])
+    [constant_float_global, get_nofortranconst_float_global()])
 
   ASSERT(all(runtime_ints == 4))
   ASSERT(all(runtime_floats == 1.23))

Examples/test-suite/fortran/multi_import_runme.F90

@@ -5,7 +5,7 @@
 program imports_runme
   use multi_import_a, only : ZZZ
   use multi_import_b, only : YYY
-  use multi_import_d, only : myval
+  use multi_import_d, only : get_myval
   use ISO_C_BINDING
   implicit none
   type(ZZZ) :: z
@@ -21,6 +21,6 @@ program imports_runme
   ASSERT(y%testx() == 0)
   call y%release()
 
-  ASSERT(myval == 1234)
+  ASSERT(get_myval() == 1234)
 
 end program

Examples/test-suite/fortran_global_const.i

@@ -1,19 +1,22 @@
 %module fortran_global_const
 
+// Wrap as 'parameters'
 %fortranconst fortranconst_int_global;
 %fortranconst fortranconst_float_global;
 %constant int fortranconst_int_global = 4;
 %constant float fortranconst_float_global = 1.23f;
 
-// Neither of these is wrapped as native constants (disabled by default)
+// Wrap as externally-linked constants
+%fortranbindc constant_int_global;
+%fortranbindc constant_float_global;
 %constant int constant_int_global = 4;
 %constant float constant_float_global = 1.23f;
 
-%nofortranconst nofortranconst_int_global;
-%nofortranconst nofortranconst_float_global;
+// Default wrapping: getters
 %constant int nofortranconst_int_global = 4;
 %constant float nofortranconst_float_global = 1.23f;
 
+%fortranbindc MACRO_INT;
 %fortranconstvalue(4) MACRO_HEX_INT;
 
 %inline %{

Examples/test-suite/fortran_naming.i

@@ -18,6 +18,8 @@
 %rename(m_x) MyStruct::_x;
 %rename(m_y) MyStruct::_y;
 
+%fortranconst _123;
+
 %inline %{
 // Forward-declare and operate on pointer
 class _Foo;
@@ -107,6 +109,7 @@ extern "C" int _0cboundfunc(const int _x) { return _x + 1; }
 
 %}
 
+%fortranconst;
 // This name is too long
 %constant int sixty_four_characters_is_way_too_long_for_fortran_or_punch_cards = 64;
 // This name shows that you can't simply truncate
@@ -115,6 +118,7 @@ extern "C" int _0cboundfunc(const int _x) { return _x + 1; }
 // This name is the maximum length but starts with an underscore
 %constant int _leading_underscore_with_sixty_four_characters_is_just_darn_long = 64;
 %constant int _leading_underscore_with_sixty_three_characters_might_be_tricky = 63;
+%nofortranconst;
 
 // This class is poorly named, but the symname is OK.
 %inline %{