src/hg/blastToPsl/tests/makefile 1.23

Index: src/hg/blastToPsl/tests/makefile
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/blastToPsl/tests/makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -b -B -U 4 -r1.22 -r1.23
--- src/hg/blastToPsl/tests/makefile	6 Feb 2010 08:17:50 -0000	1.22
+++ src/hg/blastToPsl/tests/makefile	8 Feb 2010 03:04:24 -0000	1.23
@@ -1,20 +1,46 @@
-include ../../../inc/common.mk
+include ../../../../inc/common.mk
 
 #blastToPsl = valgrind --tool=memcheck ../blastToPsl
-blastToPsl = ../blastToPsl
+blastToPsl = blastToPsl
+
+#blastXmlToPsl = valgrind --tool=memcheck ../blastToPsl
+blastXmlToPsl = blastXmlToPsl
 
 all:
 
-test:	protMrnaTest protDnaTest mrnaDnaTest mrnaDnaxTest \
+test: testBlastToPsl testBlastXmlToPsl
+
+###
+# blastToPsl
+###
+testBlastToPsl:	protMrnaTest protDnaTest mrnaDnaTest mrnaDnaxTest \
 	blockBugTest identityBugTest protMrnaEval1Test protMrnaEval2Test \
 	longDbNameTest multiLineDescTest tblastxTest tblastnTest \
-	blastpPsiTest psiNoHitsTest psiBadFormatTest blastpPsiWrapTest \
+	blastpPsiTest psiNoHitsTest psiBadFormatTest blastpPsiWrapTest
+
+###
+# blastXmlToPsl
+###
+testBlastXmlToPsl: mrna1Test prot1Test prot2Test
 
-# blast+ not implemented yet
-#	blastn+Test
+mrna1Test: mkdirs
+	${blastXmlToPsl} -scores=output/$@.bscores input/mrna1.blastn.xml output/$@.psl
+	pslCheck -verbose=0 output/$@.psl
+	diff -u expected/$@.psl output/$@.psl
+	diff -u expected/$@.bscores output/$@.bscores
+
+prot1Test: mkdirs
+	${blastXmlToPsl} -scores=output/$@.bscores input/prot1.tblastn.xml output/$@.psl
+	pslCheck -verbose=0 output/$@.psl
+	diff -u expected/$@.psl output/$@.psl
+	diff -u expected/$@.bscores output/$@.bscores
 
-#tblastnDbFirstTest megaBlastTest
+prot2Test: mkdirs
+	${blastXmlToPsl} -scores=output/$@.bscores input/prot2.psiblast.xml output/$@.psl
+	pslCheck -verbose=0 output/$@.psl
+	diff -u expected/$@.psl output/$@.psl
+	diff -u expected/$@.bscores output/$@.bscores
 
 protMrnaTest: mkdirs
 	${blastToPsl} -scores=output/$@.bscores input/kgProtMRna1.blast output/$@.psl
 	pslCheck -verbose=0 output/$@.psl
@@ -133,16 +159,8 @@
 	diff -u expected/$@.psl output/$@.psl
 	diff -u expected/$@.bscores output/$@.bscores
 	diff -u expected/$@.err output/$@.err
 
-# blast+ changes output format
-blastn+Test: mkdirs
-	${blastToPsl} -scores=output/$@.bscores input/blastn+.blast output/$@.psl >output/$@.err 2>&1
-	pslCheck -verbose=0 output/$@.psl
-	diff -u expected/$@.psl output/$@.psl
-	diff -u expected/$@.bscores output/$@.bscores
-
-
 clean::
 	rm -rf output
 
 mkdirs: