[CI] fast H2rootcheck

.github/workflows/root-ci-config/build_root.py

@@ -59,7 +59,7 @@
 
     cleanup_previous_build()
 
     this_script_dir = os.path.dirname(os.path.abspath(__file__))
 
     # Compute CMake build options:
     # - Get global options
@@ -323,7 +323,7 @@
     builddir = os.path.join(WORKDIR, "build")
     ctest_result = subprocess_with_log(f"""
         cd '{builddir}'
-        ctest --output-on-failure --parallel {os.cpu_count()} --output-junit TestResults.xml {extra_ctest_flags}
+        ctest -R "roottest-root-hist-h2root" --output-on-failure --parallel {os.cpu_count()} --output-junit TestResults.xml {extra_ctest_flags}
     """)
 
     return ctest_result

.github/workflows/root-ci-config/buildconfig/mac14.txt

@@ -26,7 +26,6 @@ builtin_xxhash=ON
 builtin_zeromq=ON
 builtin_zstd=ON
 cocoa=ON
-fortran=OFF
 minuit2_omp=OFF
 test_distrdf_dask=OFF
 test_distrdf_pyspark=OFF

main/CMakeLists.txt

@@ -53,7 +53,6 @@ generateHeader(hadd
 
 if(fortran AND CMAKE_Fortran_COMPILER)
   ROOT_EXECUTABLE(g2root g2root.f LIBRARIES minicern CMAKENOEXPORT)
-  set_target_properties(g2root PROPERTIES COMPILE_FLAGS "-w")
   ROOT_EXECUTABLE(h2root h2root.cxx LIBRARIES Core RIO Net Hist Graf Graf3d Gpad Tree Matrix MathCore Thread minicern CMAKENOEXPORT)
 
   # This is needed in particular for macOS, where the path of the GNU Fortran

misc/minicern/CMakeLists.txt

@@ -11,10 +11,6 @@
 ROOT_LINKER_LIBRARY(minicern *.c *.f TYPE STATIC)
 set_property(TARGET minicern PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(minicern ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
-
-# Disable optimization since it some cases was causing crashes.
-# Disable warnings, since what has worked for 40 years...
-# (see https://sft.its.cern.ch/jira/browse/ROOT-9179 for the warnings)
-set_target_properties(minicern PROPERTIES COMPILE_FLAGS "-O0 -w")
-# set_target_properties(minicern PROPERTIES COMPILE_FLAGS "-fsanitize=undefined -fsanitize=address")
-# target_link_options(minicern BEFORE PUBLIC -fsanitize=undefined PUBLIC -fsanitize=address)
+set_target_properties(minicern PROPERTIES COMPILE_FLAGS "-Wall -Wextra")
+# set_target_properties(minicern PROPERTIES COMPILE_FLAGS "-fsanitize=undefined -fsanitize=address") # TODO enabling this shows issues
+# target_link_options(minicern BEFORE PUBLIC -fsanitize=undefined PUBLIC -fsanitize=address) # TODO enabling this shows issues

misc/minicern/src/hcflag.inc

@@ -0,0 +1,5 @@
+C=== hcflag.inc ================================================
+      INTEGER ID,IDBADD,LID,IDLAST,IDHOLD,NBIT,NBITCH,
+     +        NCHAR,NRHIST,IERR,NV
+      COMMON /HCFLAG/ ID,IDBADD,LID,IDLAST,IDHOLD,NBIT,NBITCH,
+     +                NCHAR,NRHIST,IERR ,NV

misc/minicern/src/kernlib.f

@@ -195,8 +195,8 @@ SUBROUTINE SBIT0 (IZW,IZP)
 *-------------------------------------------------------------------------------
 
       SUBROUTINE UCTOH (MS,MT,NPW,NCH)
-      CHARACTER    MS*99
-      DIMENSION    MT(99)
+      CHARACTER    MS*(*)
+      DIMENSION    MT(NPW)
       PARAMETER   (NBITPW=32)
       PARAMETER   (NCHAPW=4)
       CHARACTER    CHWORD*(NCHAPW)
@@ -244,7 +244,7 @@ SUBROUTINE UCTOH (MS,MT,NPW,NCH)
 
       SUBROUTINE UHTOC (MS,NPW,MT,NCH)
       DIMENSION    MS(99)
-      CHARACTER    MT*99
+      CHARACTER    MT*128
       PARAMETER   (NCHAPW=4)
       CHARACTER    CHWORD*(NCHAPW)
       INTEGER      IWORD
@@ -310,14 +310,15 @@ SUBROUTINE UCTOH1 (MS,MT,NCH)
       SUBROUTINE UCOPYI (IA,IB,N)
       DIMENSION IA(*),IB(*)
       IF (N.EQ.0) RETURN
-         DO 21 I=1,N
-   21 IB(I)=IA(I)
+      DO 21 I=1,N
+   21   IB(I) = IA(I)
       END
+
       SUBROUTINE UCOPY (A,B,N)
       DIMENSION A(*),B(*)
       IF (N.EQ.0) RETURN
-         DO 21 I=1,N
-   21 B(I)=A(I)
+      DO 21 I=1,N
+   21   B(I) = A(I)
       END
 
 *-------------------------------------------------------------------------------

misc/minicern/src/param1.inc

@@ -0,0 +1,12 @@
+C=== param1.inc ================================================
+      INTEGER   ZBITS,  ZNDIM,  ZNOENT, ZNPRIM, ZNRZB,  ZIFCON,
+     +          ZIFNAM, ZIFCHA, ZIFINT, ZIFREA, ZNWTIT, ZITIT1,
+     +          ZNCHRZ, ZDESC,  ZLNAME, ZNAME,  ZARIND, ZRANGE, ZNADDR,
+     +          ZIBLOK, ZNBLOK, ZLCONT, ZIFBIT, ZIBANK, ZIFTMP, ZITMP,
+     +          ZID,    ZNTMP,  ZNTMP1, ZLINK
+      PARAMETER(ZBITS=1,   ZNDIM=2,   ZNOENT=3,  ZNPRIM=4,  ZLCONT=6,
+     +          ZNRZB=5,   ZIFCON=7,  ZIFNAM=4,  ZIFCHA=5,  ZIFINT=6,
+     +          ZIFREA=7,  ZNWTIT=8,  ZITIT1=9,  ZNCHRZ=13, ZIFBIT=8,
+     +          ZDESC=1,   ZLNAME=2,  ZNAME=3,   ZRANGE=4,  ZNADDR=12,
+     +          ZARIND=11, ZIBLOK=8,  ZNBLOK=10, ZIBANK=9,  ZIFTMP=11,
+     +          ZID=12,    ZITMP=10,  ZNTMP=6,   ZNTMP1=3,  ZLINK=6)

misc/minicern/src/param2.inc

@@ -0,0 +1,9 @@
+C=== param2.inc ================================================
+      INTEGER   KNCX   ,KXMIN  ,KXMAX  ,KMIN1  ,KMAX1 ,KNORM  , KTIT1,
+     +          KNCY   ,KYMIN  ,KYMAX  ,KMIN2  ,KMAX2 ,KSCAL2 , KTIT2,
+     +          KNBIT  ,KNOENT ,KSTAT1 ,KNSDIR  ,KNRH ,
+     +          KCON1  ,KCON2  ,KBITS  ,KNTOT
+      PARAMETER(KNCX=3,KXMIN=4,KXMAX=5,KMIN1=7,KMAX1=8,KNORM=9,KTIT1=10,
+     +          KNCY=7,KYMIN=8,KYMAX=9,KMIN2=6,KMAX2=10,KSCAL2=11,
+     +          KTIT2=12,KNBIT=1,KNOENT=2,KSTAT1=3,KNSDIR=5,KNRH=6,
+     +          KCON1=9,KCON2=3,KBITS=1,KNTOT=2)

misc/minicern/src/pawc.inc

@@ -0,0 +1,4 @@
+C=== pawc.inc ==================================================
+      INTEGER NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,IFENCE,LMAIN,IPAW
+      COMMON /PAWC/ NWPAW,IXPAWC,IHDIV,IXHIGZ,IXKU,IFENCE(5),LMAIN,
+     +              IPAW(4000000-11)

misc/minicern/src/quest.inc

@@ -0,0 +1,3 @@
+C=== quest.inc =================================================
+      INTEGER IQUEST
+      COMMON /QUEST/ IQUEST(100)