Merge remote-tracking branch 'upstream/develop' into feature/FastForward

.gitignore

@@ -23,3 +23,4 @@ install.log
 
 # Code style checker temporary files
 tmp
+include/fti-defs.h

CMakeLists.txt

@@ -413,7 +413,7 @@ else()
 endif()
 
 if(NOT ENABLE_COVERAGE)
-    set(ADD_CFLAGS "${ADD_CFLAGS} -O3")
+    set(ADD_CFLAGS "${ADD_CFLAGS} -O1")
 endif()
 
 # TODO: COMPILER_FLAGS is superseded by COMPILER_OPTIONS (CMake 3.6+)

testing/CMakeLists.txt

@@ -40,7 +40,7 @@ function(InstallTestApplication AppName)
   add_executable(${AppName} ${ARGN})
   target_link_libraries(${AppName} fti.static ${MPI_C_LIBRARIES} m)
   target_include_directories(${AppName} PUBLIC ${CMAKE_SOURCE_DIR}/include)
-  set_property(TARGET ${AppName} APPEND PROPERTY COMPILE_FLAGS "${MPI_C_COMPILE_FLAGS} -O3")
+  set_property(TARGET ${AppName} APPEND PROPERTY COMPILE_FLAGS "${MPI_C_COMPILE_FLAGS} -O1")
   set_property(TARGET ${AppName} APPEND PROPERTY LINK_FLAGS ${MPI_C_LINK_FLAGS})
 endfunction()
 
@@ -50,7 +50,7 @@ function(InstallFortTestApplication AppName)
   target_link_libraries(${AppName} fti_f90.static ${MPI_Fortran_LIBRARIES} m)
 
   set_property(TARGET ${AppName} APPEND PROPERTY
-    COMPILE_FLAGS "${MPI_Fortran_COMPILE_FLAGS} -O3")
+    COMPILE_FLAGS "${MPI_Fortran_COMPILE_FLAGS} -O1")
   set_property(TARGET ${AppName} APPEND PROPERTY
     LINK_FLAGS ${MPI_Fortran_LINK_FLAGS})
   if(NOT MPI_USE_MOD)

testing/suites/compilation/cmake_versions.itf

@@ -77,9 +77,11 @@ setup() {
     unset CC
     rootdir=$(git rev-parse --show-toplevel)
     rm -rf $rootdir/install
+    rm -rf $rootdir/build
 }
 
 teardown() {
+    rm -rf $rootdir/install
     rm -rf $rootdir/build
     unset rootdir
 }

testing/suites/features/fortran/datatypes/ckpt_primitives.c

@@ -18,8 +18,8 @@
 #define LX_INIT 1               // Fortran 'true' maps to 1 in C
 #define I1_INIT 127 - i         // Greater 8-bit number minus i
 #define I2_INIT 32767 - i       // Greater 16-bit number minus i
-#define I4_INIT 2147483647 - i  // Greater 32-bit number minus i
-#define I8_INIT 2147483647 + i  // Greater 32-bit number plus i
+#define I4_INIT 27 - i
+#define I8_INIT 3 + i
 #define R4_INIT 10 + i
 #define R8_INIT 20 + i
 #define R16_INIT 30 + i

testing/suites/features/fortran/datatypes/ckpt_primitives.f90

@@ -95,8 +95,8 @@ program checkpoint_primitives
 
          i1(i) = 127 - (i-1)
          i2(i) = 32767 - (i-1)
-         i4(i) = 2147483647 - (i-1)
-         i8(i) = 2147483647 + (i-1)
+         i4(i) = 27 - (i-1)
+         i8(i) = 3 + (i-1)
 
          r4(i) = 10 + (i-1)
          r8(i) = 20 + (i-1)
@@ -191,13 +191,13 @@ program checkpoint_primitives
          end if
          call exit(1)
       end if
-      if (i4(i) /= 2147483647 - (i - 1)) then
+      if (i4(i) /= 27 - (i - 1)) then
          if (rank == 0) then
             print *, "integer(4) was corrupted: ", i4(i)
          end if
          call exit(1)
       end if
-      if (i8(i) /= 2147483647 + (i - 1)) then
+      if (i8(i) /= 3 + (i - 1)) then
          if (rank == 0) then
             print *, "integer(8) was corrupted: ", i8(i)
          end if