1. petsc
  2. PETSc
  3. petsc

Commits

Vijay Mahadevan  committed 39326c0 Merge

Merge remote-tracking branch 'upstream/barry/feature-dmmoab-hdf5-tests' into feature-dmmoab

  • Participants
  • Parent commits c2612ac, da48ddd
  • Branches master

Comments (0)

Files changed (3)

File conf/test

View file
  • Ignore whitespace
 testexamples_YAML: ${TESTEXAMPLES_YAML}
 testexamples_THREADCOMM: ${TESTEXAMPLES_THREADCOMM}
 testexamples_MOAB: ${TESTEXAMPLES_MOAB}
+testexamples_MOAB_HDF5: ${TESTEXAMPLES_MOAB_HDF5}
 testexamples_X:
 testexamples_OPENGL:
 testexamples_MPE:

File config/PETSc/utilities/Regression.py

View file
  • Ignore whitespace
         for i in self.framework.packages:
           if not i.name.upper() in ['SOWING','C2HTML','BLASLAPACK','MPI','SCALAPACK','PTHREAD','CUDA','THRUST','VALGRIND','NUMDIFF']:
             ejobs.append(i.name.upper())
+          # horrible python here
+          if i.name.upper() == 'MOAB':
+            for j in self.framework.packages:
+              if j.name.upper() == 'HDF5':
+                ejobs.append('MOAB_HDF5')
 
     self.addMakeMacro('TEST_RUNS',' '.join(jobs)+' '+' '.join(ejobs)+' '+' '.join(rjobs))
     return

File src/ts/examples/tutorials/makefile

View file
  • Ignore whitespace
 TESTEXAMPLES_13		  = ex2.PETSc ex2.rm ex3.PETSc ex3.rm ex4.PETSc ex4.rm \
                             ex5.PETSc ex5.rm
 TESTEXAMPLES_EXODUSII     = ex11.PETSc runex11 ex11.rm
-TESTEXAMPLES_MOAB         = ex30.PETSc runex30 ex30.rm ex35.PETSc runex35 runex35_2 ex35.rm
+TESTEXAMPLES_MOAB         = ex30.PETSc runex30 ex30.rm ex35.PETSc runex35 ex35.rm
+TESTEXAMPLES_MOAB_HDF5    = ex35.PETSc runex35_2 ex35.rm
 
 include ${PETSC_DIR}/conf/test