Merge pull request #18982 from smuzaffar/fix-geners-cdump-test

Fix geners cdump test
cms-sw · May 27, 2017 · 135d109 · 135d109
2 parents 95d1397 + b1040b9
commit 135d109
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/Alignment/Geners/test/BuildFile.xml b/Alignment/Geners/test/BuildFile.xml
@@ -18,7 +18,4 @@
    <use  name="Alignment/Geners"/>
 </bin>
 
-<bin  file="GenersTestHelper_t.cc">
-   <use  name="FWCore/Utilities"/>
-   <flags   TEST_RUNNER_ARGS=" /bin/tcsh Alignment/Geners/test test_cdump.csh"/>
-</bin>
+<test name="GenersTestHelper_t" command="test_cdump.sh"/>
diff --git a/Alignment/Geners/test/GenersTestHelper_t.cc b/Alignment/Geners/test/GenersTestHelper_t.cc
diff --git a/Alignment/Geners/test/test_cdump.csh b/Alignment/Geners/test/test_cdump.csh
diff --git a/Alignment/Geners/test/test_cdump.sh b/Alignment/Geners/test/test_cdump.sh
@@ -0,0 +1,16 @@
+#!/bin/bash -ex
+cdump_dir=${CMSSW_BASE}
+for dir in ${CMSSW_BASE} ${CMSSW_RELEASE_BASE} ${CMSSW_FULL_RELEASE_BASE} ; do
+  if [ -e ${dir}/test/${SCRAM_ARCH}/cdump ] ; then
+    cdump_dir=${dir}
+    break
+  fi
+done
+rm -f Alignment_Geners_cdump.out
+${cdump_dir}/test/${SCRAM_ARCH}/cdump -f ${cdump_dir}/src/Alignment/Geners/test/archive.gsbmf > Alignment_Geners_cdump.out 2>&1
+if [ $(diff Alignment_Geners_cdump.out ${cdump_dir}/src/Alignment/Geners/test/cdump.ref | wc -l) -gt 0 ] ;  then
+    echo "!!!! Catalog dump regression test FAILED"
+else
+    echo "**** Catalog dump regression test passed"
+fi
+rm -f Alignment_Geners_cdump.out