[PATCH] D128260: [Fortran] Ignore whitespace in FCVS test results

[Diana Picus via Phabricator via llvm-commits]

rovka updated this revision to Diff 440129.
rovka set the repository for this revision to rT test-suite.
rovka added a comment.

Try to fix CI patch application - take 2.


Repository:
  rT test-suite

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D128260/new/

https://reviews.llvm.org/D128260

Files:
  Fortran/UnitTests/fcvs21_f95/CMakeLists.txt
  cmake/modules/SingleMultiSource.cmake


Index: cmake/modules/SingleMultiSource.cmake
===================================================================
--- cmake/modules/SingleMultiSource.cmake
+++ cmake/modules/SingleMultiSource.cmake
@@ -128,6 +128,9 @@
     if(FP_ABSTOLERANCE)
       set(DIFFPROG "${DIFFPROG} -a ${FP_ABSTOLERANCE}")
     endif()
+    if(FP_IGNOREWHITESPACE)
+      set(DIFFPROG "${DIFFPROG} -i")
+    endif()
     llvm_test_verify(${DIFFPROG} %o %S/${REFERENCE_OUTPUT})
     llvm_test_data(${target} ${REFERENCE_OUTPUT})
   endif()
Index: Fortran/UnitTests/fcvs21_f95/CMakeLists.txt
===================================================================
--- Fortran/UnitTests/fcvs21_f95/CMakeLists.txt
+++ Fortran/UnitTests/fcvs21_f95/CMakeLists.txt
@@ -33,7 +33,18 @@
 # clean-up fort.* files otherwise one of the tests will fail
 llvm_test_prepare(rm -f %S/fort.*)
 
+# Tests 905 and 907 use list-directed output, for which the standard allows some
+# flexibility. Treat them separately.
+set(SPECIAL_CASES "FM905.f" "FM907.f")
+set(Source ${SPECIAL_CASES})
+set(FP_IGNOREWHITESPACE ON)
+llvm_singlesource()
+set(Source)
+
 file(GLOB Source CONFIGURE_DEPENDS *.f)
+foreach (SPECIAL_CASE ${SPECIAL_CASES})
+  list(FILTER Source EXCLUDE REGEX ${SPECIAL_CASE})
+endforeach()
 
 # Test 509 requires this flag in more recent versions of GCC.
 # If this flag is not supported, the test should be excluded.
@@ -46,6 +57,7 @@
 endif()
 
 set(FP_TOLERANCE 1.0e-11) # set by the most sensitive numerical test
+set(FP_IGNOREWHITESPACE OFF)
 llvm_singlesource()
 
 file(COPY lit.local.cfg DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D128260.440129.patch
Type: text/x-patch
Size: 1602 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220627/eaf2b744/attachment.bin>