Commits

Satish Balay  committed 46ed603

tests: split up C++ tests [which can run with clanguage=c with C++ compiler build]

  • Participants
  • Parent commits 10aa3c1

Comments (0)

Files changed (3)

 #   17 - requires PYTHON or wget and Unix (uses urlget) and popen()
 
 testexamples_C: ${TESTEXAMPLES_C}
+testexamples_Cxx: ${TESTEXAMPLES_CXX}
 testexamples_C_X: ${TESTEXAMPLES_C_X}
 testexamples_Fortran: ${TESTEXAMPLES_FORTRAN}
 testexamples_C_X_MPIUni: ${TESTEXAMPLES_C_X_MPIUNI}
 testexamples_C_Complex: ${TESTEXAMPLES_C_COMPLEX}
 testexamples_C_NoComplex: ${TESTEXAMPLES_C_NOCOMPLEX}
 testexamples_DATAFILESPATH: ${TESTEXAMPLES_DATAFILESPATH}
+testexamples_Cxx_DATAFILESPATH: ${TESTEXAMPLES_CXX_DATAFILESPATH}
 
 testexamples_F90_DataTypes: ${TESTEXAMPLES_F90_DATATYPES}
 testexamples_Fortran_NoComplex: ${TESTEXAMPLES_FORTRAN_NOCOMPLEX}
 
 buildexamples_C:
 	-@${OMAKE} testexamples_C TESTEXAMPLES_C=`echo ${TESTEXAMPLES_C} | sed s/runex[0-9]*[a-z0-9_]*//g`
+buildexamples_Cxx:
+	-@${OMAKE} testexamples_Cxx TESTEXAMPLES_CXX=`echo ${TESTEXAMPLES_CXX} | sed s/runex[0-9]*[a-z0-9_]*//g`
 buildexamples_C_X:
 	-@${OMAKE} testexamples_C_X TESTEXAMPLES_C_X=`echo ${TESTEXAMPLES_C_X} | sed s/runex[0-9]*[a-z0-9_]*//g`
 buildexamples_Fortran:
 	-@${OMAKE} testexamples_C_NoComplex TESTEXAMPLES_C_NOCOMPLEX=`echo ${TESTEXAMPLES_C_NOCOMPLEX} | sed s/runex[0-9]*[a-z0-9_]*//g`
 buildexamples_DATAFILESPATH:
 	-@${OMAKE} testexamples_DATAFILESPATH TESTEXAMPLES_DATAFILESPATH=`echo ${TESTEXAMPLES_DATAFILESPATH} | sed s/runex[0-9]*[a-z0-9_]*//g`
+buildexamples_Cxx_DATAFILESPATH:
+	-@${OMAKE} testexamples_Cxx_DATAFILESPATH TESTEXAMPLES_CXX_DATAFILESPATH=`echo ${TESTEXAMPLES_CXX_DATAFILESPATH} | sed s/runex[0-9]*[a-z0-9_]*//g`
 
 buildexamples_F90_DataTypes:
 	-@${OMAKE} testexamples_F90_DataTypes TESTEXAMPLES_F90_DATATYPES=`echo ${TESTEXAMPLES_F90_DATATYPES} | sed s/runex[0-9]*[a-z0-9_]*//g`

File config/PETSc/utilities/Regression.py

         jobs.append('Fortran_MPIUni')
     else:
       jobs.append('C')
+      if hasattr(self.compilers, 'CXX'):
+        rjobs.append('Cxx')
       if self.x.found:
         jobs.append('C_X')
       if hasattr(self.compilers, 'FC') and self.fortrancpp.fortranDatatypes:
         rjobs.append('C_NoComplex')
         if self.datafilespath.datafilespath and self.scalartypes.precision == 'double' and self.libraryOptions.integerSize == 32:
           rjobs.append('DATAFILESPATH')
+          if hasattr(self.compilers, 'CXX'):
+            rjobs.append('Cxx_DATAFILESPATH')
       # add jobs for each external package BUGBUGBUG may be run before all packages
       # Note: do these tests only for non-complex builds
       if self.scalartypes.scalartype.lower() != 'complex':

File src/vec/is/ao/examples/tests/ex3d/makefile

 TESTEXAMPLES_FORTRAN	  =
 TESTEXAMPLES_C_X_MPIUNI =
 TESTEXAMPLES_C3		  =
-TESTEXAMPLES_DATAFILESPATH = ex3.PETSc runex3 runex3_2 runex3_3 runex3_4 ex3.rm
+TESTEXAMPLES_CXX_DATAFILESPATH = ex3.PETSc runex3 runex3_2 runex3_3 runex3_4 ex3.rm
 
 include ${PETSC_DIR}/conf/test