[test] rename CINT to CLING and MAKECINT to ROOTCLING

ferdymercury · ferdymercury · commit 62c42a67f968 · 2025-09-11T09:04:53.000+02:00
[test] Try removing ifdef guards to see if it solves the test failure

[test] attempt run interpreted
diff --git a/test/TestVectors.cxx b/test/TestVectors.cxx
@@ -1,7 +1,7 @@
 // @(#)root/test:$Id$
 // Author: Peter Malzacher   19/06/99
 
-#ifndef __CINT__
+#ifndef __CLING__
 #include <Riostream.h>
 #include <TMath.h>
 #include <TVector3.h>
diff --git a/test/dt_MakeRef.C b/test/dt_MakeRef.C
@@ -7,7 +7,7 @@
 #include "TH2.h"
 #include "TSystem.h"
 
-#ifndef __CINT__
+#ifndef __CLING__
 #include "Event.h"
 #endif
 
diff --git a/test/hsimple.cxx b/test/hsimple.cxx
@@ -16,7 +16,7 @@
 
 int hsimple();
 
-#ifndef __CINT__
+#ifndef __CLING__
 #include "TFile.h"
 #include "TH1.h"
 #include "TH2.h"
diff --git a/test/minexam.cxx b/test/minexam.cxx
@@ -23,7 +23,7 @@
 void fcnk0(int &npar, double *gin, double &f, double *x, int iflag);
 int minexam();
 
-#ifndef __CINT__
+#ifndef __CLING__
 #include "TVirtualFitter.h"
 #include "TMath.h"
 #include "TStopwatch.h"
diff --git a/test/stress.cxx b/test/stress.cxx
@@ -68,7 +68,7 @@
 //******************************************************************
 //
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 #include <cstdlib>
 #include <TROOT.h>
@@ -221,7 +221,7 @@ void stress(Int_t nevent, Int_t style = 1,
    Float_t mbtot1 = mbin1+mbout1;
    printf("stress    : Compr I/O =%7.1f Mbytes, I =%7.1f, O =%6.1f\n",mbtot1,mbin1,mbout1);
    gBenchmark->Print("stress");
-#ifndef __CINT__
+#ifndef __CLING__
    Float_t cp_brun_30   = 12.73;
    Float_t cp_brun_1000 = 61.88;
 #else
diff --git a/test/stressEntryList.cxx b/test/stressEntryList.cxx
@@ -672,7 +672,7 @@ Int_t stressEntryList(Int_t nentries, Int_t nfiles)
    return retval;
 }
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 int main(int argc, char *argv[])
 {
diff --git a/test/stressFit.cxx b/test/stressFit.cxx
@@ -659,7 +659,7 @@ Int_t stressFit(const char *type, const char *algo, Int_t N)
 
   printf("******************************************************************\n");
   gBenchmark->Print("stressFit");
-#ifdef __CINT__
+#ifdef __CLING__
   Double_t reftime = 86.34; //macbrun interpreted
 #else
   Double_t reftime = 12.07; //macbrun compiled
@@ -675,7 +675,7 @@ Int_t stressFit(const char *type, const char *algo, Int_t N)
 }
 
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 int main(int argc,const char *argv[])
 {
diff --git a/test/stressGeometry.cxx b/test/stressGeometry.cxx
@@ -57,7 +57,7 @@
 Double_t tpstot = 0;
 Double_t tpsref = 112.1; //time including the generation of the ref files
 Bool_t testfailed = kFALSE;
-#ifndef __CINT__
+#ifndef __CLING__
 void stressGeometry(const char*, Bool_t, Bool_t);
 
 int main(int argc, char **argv)
diff --git a/test/stressIOPlugins.cxx b/test/stressIOPlugins.cxx
@@ -53,7 +53,7 @@
 //         : filename with a url query in Add...................... OK
 // ****************************************************************************
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 #include <cstdlib>
 #include <snprintf.h>
diff --git a/test/stressInterpreter.cxx b/test/stressInterpreter.cxx
@@ -440,7 +440,7 @@ bool stressInterpreter(Int_t ntimes = 10, const char* runTests = 0, const char*
    return !stress.run(ntimes, runTests);
 }
 
-#if !defined(__CINT__) && !defined(__CLING__)
+#if !defined(__CLING__) && !defined(__CLING__)
 // If compiled: interpret! (by default)
 
 int main(int argc, char **argv)
diff --git a/test/stressLinear.cxx b/test/stressLinear.cxx
@@ -179,7 +179,7 @@ void   stress_backward_io          ();
 void   cleanup                     ();
 
 //_____________________________batch only_____________________
-#ifndef __CINT__
+#ifndef __CLING__
 
 int main(int argc,const char *argv[])
 {
@@ -234,7 +234,7 @@ void stressLinear(Int_t maxSizeReq,Int_t verbose)
     mstress_binary_ebe_op(maxSize/2,maxSize);
     mstress_transposition(maxSize);
     mstress_special_creation(maxSize);
-#ifndef __CINT__
+#ifndef __CLING__
     mstress_matrix_promises(maxSize);
 #endif
     mstress_norms(maxSize,maxSize/2);
@@ -462,7 +462,7 @@ void mstress_matrix_fill(Int_t rsize,Int_t csize)
   if (gVerbose)
     std::cout << "Creating m  with Apply function..." << std::endl;
   TMatrixD m(-1,rsize-2,1,csize);
-#ifndef __CINT__
+#ifndef __CLING__
   FillMatrix f(m);
   m.Apply(f);
 #else
@@ -736,7 +736,7 @@ void mstress_element_op(Int_t rsize,Int_t csize)
   if (gVerbose)
     std::cout << "\nCheck out to see that sin^2(x) + cos^2(x) = 1" << std::endl;
   {
-#ifndef __CINT__
+#ifndef __CLING__
     FillMatrix f(m);
     m.Apply(f);
 #else
@@ -747,7 +747,7 @@ void mstress_element_op(Int_t rsize,Int_t csize)
   }
   m1 = m;
   {
-#ifndef __CINT__
+#ifndef __CLING__
     ApplyFunction s(&TMath::Sin);
     ApplyFunction c(&TMath::Cos);
     m.Apply(s);
@@ -936,7 +936,7 @@ class MakeHilbert : public TElementPosActionD {
   MakeHilbert() { }
 };
 
-#if !defined (__CINT__) || defined (__MAKECINT__)
+#if !defined (__CLING__) || defined (__ROOTCLING__)
 class TestUnit : public TElementPosActionD {
   mutable Int_t fIsUnit;
   void Operation(Double_t &element) const override
@@ -971,7 +971,7 @@ void mstress_special_creation(Int_t dim)
     TMatrixD m1(TMatrixD::kZero,m);
     ok &= ( !(m == m1) ) ? kTRUE : kFALSE;
     ok &= ( m != 0 ) ? kTRUE : kFALSE;
-#ifndef __CINT__
+#ifndef __CLING__
     MakeHilbert mh;
     m1.Apply(mh);
 #else
@@ -999,7 +999,7 @@ void mstress_special_creation(Int_t dim)
     if (gVerbose)
       std::cout << "test creating unit matrices" << std::endl;
     TMatrixD m(dim,dim);
-#ifndef __CINT__
+#ifndef __CLING__
     {
       TestUnit test_unit;
       m.Apply(test_unit);
@@ -1009,7 +1009,7 @@ void mstress_special_creation(Int_t dim)
     ok &= ( !is_indeed_unit(m) ) ? kTRUE : kFALSE;
 #endif
     m.UnitMatrix();
-#ifndef __CINT__
+#ifndef __CLING__
     {
       TestUnit test_unit;
        m.Apply(test_unit);
@@ -1020,7 +1020,7 @@ void mstress_special_creation(Int_t dim)
 #endif
     m.ResizeTo(dim-1,dim);
     TMatrixD m2(TMatrixD::kUnit,m);
-#ifndef __CINT__
+#ifndef __CLING__
     {
       TestUnit test_unit;
       m2.Apply(test_unit);
@@ -1031,7 +1031,7 @@ void mstress_special_creation(Int_t dim)
 #endif
     m.ResizeTo(dim,dim-2);
     m.UnitMatrix();
-#ifndef __CINT__
+#ifndef __CLING__
     {
       TestUnit test_unit;
       m.Apply(test_unit);
@@ -1081,7 +1081,7 @@ void mstress_special_creation(Int_t dim)
   StatusPrint(6,"Haar/Hilbert Matrix",ok);
 }
 
-#ifndef __CINT__
+#ifndef __CLING__
 //
 //------------------------------------------------------------------------
 //           Test matrix promises
@@ -1535,7 +1535,7 @@ void mstress_mm_multiplications()
       ok &= VerifyMatrixIdentity(mm1,mm2,verbose,epsilon);
     }
 
-#ifndef __CINT__
+#ifndef __CLING__
     if (nr >= Int_t(1.0e+5/msize/msize)) {
 #else
     if (nr >= Int_t(1.0e+3/msize/msize)) {
@@ -1879,7 +1879,7 @@ void mstress_vm_multiplications()
       ok &= VerifyMatrixIdentity(mvb,mvm,verbose,epsilon);
     }
 
-#ifndef __CINT__
+#ifndef __CLING__
     if (nr >= Int_t(1.0e+5/msize/msize)) {
 #else
     if (nr >= Int_t(1.0e+3/msize/msize)) {
@@ -2009,7 +2009,7 @@ void mstress_inversion()
       ok &= VerifyMatrixIdentity(mmi,unit,verbose,epsilon);
     }
 
-#ifndef __CINT__
+#ifndef __CLING__
     if (nr >= Int_t(1.0e+5/msize/msize)) {
 #else
     if (nr >= Int_t(1.0e+3/msize/msize)) {
@@ -2870,7 +2870,7 @@ void spstress_mm_multiplications()
       ok &= VerifyMatrixIdentity(m,mp3,verbose,epsilon);
     }
 
-#ifndef __CINT__
+#ifndef __CLING__
     if (nr >= Int_t(1.0e+5/msize/msize)) {
 #else
     if (nr >= Int_t(1.0e+3/msize/msize)) {
@@ -3002,7 +3002,7 @@ void spstress_vm_multiplications()
       ok &= VerifyMatrixIdentity(mvb,mvm,verbose,epsilon);
     }
 
-#ifndef __CINT__
+#ifndef __CLING__
     if (nr >= Int_t(1.0e+5/msize/msize)) {
 #else
     if (nr >= Int_t(1.0e+3/msize/msize)) {
@@ -3379,7 +3379,7 @@ void vstress_element_op(Int_t vsize)
       std::cout << "\nCheck out to see that sin^2(x) + cos^2(x) = 1" << std::endl;
     for (Int_t i = v.GetLwb(); i <= v.GetUpb(); i++)
       v(i) = 2*TMath::Pi()/v.GetNoElements()*i;
-#ifndef __CINT__
+#ifndef __CLING__
     SinAction s;
     v.Apply(s);
     CosAction c(v.GetNoElements());
@@ -3400,7 +3400,7 @@ void vstress_element_op(Int_t vsize)
 
   if (gVerbose)
     std::cout << "\nVerify constructor with initialization" << std::endl;
-#ifndef __CINT__
+#ifndef __CLING__
   TVectorD vi(0,4,0.0,1.0,2.0,3.0,4.0,"END");
 #else
   Double_t vval[] = {0.0,1.0,2.0,3.0,4.0};
@@ -3887,7 +3887,7 @@ Bool_t test_svd_expansion(const TMatrixD &A)
   return ok;
 }
 
-#ifndef __CINT__
+#ifndef __CLING__
 // Make a matrix from an array (read it row-by-row)
 class MakeMatrix : public TMatrixDLazy {
   const Double_t *array;
@@ -4122,7 +4122,7 @@ void astress_lineqn()
         ok &= VerifyVectorValue(b1,1.0,verbose,msize*EPSILON);
     }
 
-#ifndef __CINT__
+#ifndef __CLING__
     if (nr >= Int_t(1.0e+5/msize/msize)) {
 #else
     if (nr >= Int_t(1.0e+3/msize/msize)) {
@@ -4162,7 +4162,7 @@ void astress_pseudo()
 
   // Allocate and fill matrix A
   enum {nrows = 4, ncols = 3};
-#ifndef __CINT__
+#ifndef __CLING__
   const Double_t A_data [nrows*ncols] =
 #else
   const Double_t A_data [12] =
diff --git a/test/stressMathCore.cxx b/test/stressMathCore.cxx
@@ -16,7 +16,7 @@
 //           VecTrackD which contains an std::vector<TrackD>
 //
 //
-// the program cun run only in compiled mode.
+// the program can run only in compiled mode.
 // To run outside ROOT do:
 //
 //    > cd $ROOTSYS/test
@@ -52,9 +52,6 @@
 //
 
 
-#ifndef __CINT__
-
-
 #include "Math/DistFuncMathCore.h"
 //#define USE_MATHMORE
 #ifdef USE_MATHMORE
@@ -92,9 +89,6 @@ R__ADD_INCLUDE_PATH($ROOTSYS/test)
 
 using namespace ROOT::Math;
 
-#endif
-
-
 //#define DEBUG
 
 bool debug = true;  // print out reason of test failures
@@ -154,7 +148,6 @@ int compare( std::string name, double v1, double v2, double scale = 2.0) {
    return iret;
 }
 
-#ifndef __CINT__
 
 
 // trait class  for distinguishing the number of parameters for the various functions
@@ -1524,27 +1517,12 @@ int testCompositeObj(int ngen) {
 }
 
 
-#endif // endif ifndef __CINT__
 
 
 int stressMathCore(double nscale = 1) {
 
    int iret = 0;
 
-#ifdef __CINT__
-   std::cout << "Test must be run in compile mode - use ACLIC to compile!!" << std::endl;
-
-
-   gSystem->Load("libMathCore");
-   gSystem->Load("libTree");
-   gROOT->ProcessLine(".L stressMathCore.cxx++");
-   return stressMathCore();
-#endif
-//    iret |= gSystem->Load("libMathCore");
-//    iret |= gSystem->Load("libMathMore");
-//    if (iret !=0) return iret;
-
-
    TBenchmark bm;
    bm.Start("stressMathCore");
 
diff --git a/test/stressMathMore.cxx b/test/stressMathMore.cxx
@@ -43,7 +43,7 @@ using namespace ROOT::Math;
 
 
 
-#ifdef __CINT__
+#ifdef __CLING__
 #define INF 1.7E308
 #else
 #define INF std::numeric_limits<double>::infinity()
@@ -554,7 +554,7 @@ int stressMathMore(double nscale = 1) {
 
    int iret = 0;
 
-#ifdef __CINT__
+#ifdef __CLING__
    std::cout << "Test must be run in compile mode - please use ACLIC !!" << std::endl;
    return 0;
 #endif
diff --git a/test/stressShapes.cxx b/test/stressShapes.cxx
diff --git a/test/stressSpectrum.cxx b/test/stressSpectrum.cxx
diff --git a/test/tcollex.cxx b/test/tcollex.cxx
diff --git a/test/vmatrix.cxx b/test/vmatrix.cxx
diff --git a/test/vvector.cxx b/test/vvector.cxx

Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,7 @@ Int_t stressEntryList(Int_t nentries, Int_t nfiles)`
`672`	`672`	`return retval;`
`673`	`673`	`}`
`674`	`674`	`//_____________________________batch only_____________________`
`675`		`-#ifndef __CINT__`
	`675`	`+#ifndef __CLING__`
`676`	`676`
`677`	`677`	`int main(int argc, char *argv[])`
`678`	`678`	`{`
Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,7 @@ Int_t stressFit(const char type, const char algo, Int_t N)`
`659`	`659`
`660`	`660`	`printf("******************************************************************\n");`
`661`	`661`	`gBenchmark->Print("stressFit");`
`662`		`-#ifdef __CINT__`
	`662`	`+#ifdef __CLING__`
`663`	`663`	`Double_t reftime = 86.34; //macbrun interpreted`
`664`	`664`	`#else`
`665`	`665`	`Double_t reftime = 12.07; //macbrun compiled`
`@@ -675,7 +675,7 @@ Int_t stressFit(const char type, const char algo, Int_t N)`
`675`	`675`	`}`
`676`	`676`
`677`	`677`	`//_____________________________batch only_____________________`
`678`		`-#ifndef __CINT__`
	`678`	`+#ifndef __CLING__`
`679`	`679`
`680`	`680`	`int main(int argc,const char *argv[])`
`681`	`681`	`{`
Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ bool stressInterpreter(Int_t ntimes = 10, const char* runTests = 0, const char*`
`440`	`440`	`return !stress.run(ntimes, runTests);`
`441`	`441`	`}`
`442`	`442`
`443`		`-#if !defined(__CINT__) && !defined(__CLING__)`
	`443`	`+#if !defined(__CLING__) && !defined(__CLING__)`
`444`	`444`	`// If compiled: interpret! (by default)`
`445`	`445`
`446`	`446`	`int main(int argc, char **argv)`