Disable separate expected output for Sundials<6.7.0 as it is not valid on ubunut & make field with static when comparing output with Matlab

Author: langmm

CMakeLists.txt

@@ -454,12 +454,12 @@ function(add_ePhoto_tests)
       set(TEST_NAME ${ARGS_PREFIX}ePhoto_${DRIVER_NAME})
       set(SHOW_NAME ${TEST_NAME}_SHOW)
       set(CHECK_NAME ${TEST_NAME}_CHECK)
-      if ((DRIVER_NAME STREQUAL "EPS") AND
-          (SUNDIALS_VERSION VERSION_LESS "6.7.0"))
-        set(EXPECTED_OUTPUT ${TEST_DATA_DIR}/ePhotoOutput_${DRIVER_NAME}_SUNDIALS_LT_6p7.txt)
-      else()
-        set(EXPECTED_OUTPUT ${TEST_DATA_DIR}/ePhotoOutput_${DRIVER_NAME}.txt)
-      endif()
+      # if ((DRIVER_NAME STREQUAL "EPS") AND
+      #     (SUNDIALS_VERSION VERSION_LESS "6.7.0"))
+      #   set(EXPECTED_OUTPUT ${TEST_DATA_DIR}/ePhotoOutput_${DRIVER_NAME}_SUNDIALS_LT_6p7.txt)
+      # else()
+      set(EXPECTED_OUTPUT ${TEST_DATA_DIR}/ePhotoOutput_${DRIVER_NAME}.txt)
+      # endif()
       set(ACTUAL_OUTPUT ${ePhoto_TEST_DIR}/output_${DRIVER_NAME}.data)
       list(APPEND ePhoto_TESTS ${TEST_NAME})
       list(APPEND ePhoto_TESTS_CHECK ${CHECK_NAME})

src/Variables.cpp

@@ -358,7 +358,11 @@ std::ostream& Variables::dump(std::ostream& out,
                               const std::map<std::string, std::string>& key_aliases,
                               const std::map<MODULE, const ValueSet_t*>& conditions,
                               const std::vector<std::string>& subset) const {
+#ifdef MAKE_EQUIVALENT_TO_MATLAB
+    std::size_t pad = 35;
+#else // MAKE_EQUIVALENT_TO_MATLAB
     std::size_t pad = max_field_width_all();
+#endif // MAKE_EQUIVALENT_TO_MATLAB
     if (!subset.empty()) {
         for (typename std::vector<std::string>::const_iterator it = subset.begin();
              it != subset.end(); it++) {