e1a373956ea8f5a93f7c63208e1ee39a1aceb4de braney Wed Aug 31 11:44:17 2011 -0700 fix bug in bigWigMerge #4561. Add test that would have found it. diff --git src/utils/bigWigMerge/makefile src/utils/bigWigMerge/makefile index 936b1c6..608227d 100644 --- src/utils/bigWigMerge/makefile +++ src/utils/bigWigMerge/makefile @@ -4,15 +4,28 @@ MYLIBDIR = ../../lib/${MACHTYPE} MYLIBS = ${MYLIBDIR}/jkweb.a A = bigWigMerge O = bigWigMerge.o bigWigMerge: ${O} ${MYLIBS} ${CC} ${COPT} -o ${DESTDIR}${BINDIR}/${A}${EXE} $O ${MYLIBS} $L ${STRIP} ${DESTDIR}${BINDIR}/${A}${EXE} compile:: ${O} ${CC} ${COPT} -o ${A}${EXE} ${O} ${MYLIBS} $L clean:: rm -f ${A}${EXE} ${O} + rm -f t1.bw t2.bw 12merge.bedGraph 21merge.bedGraph + +t2.bw: + bedGraphToBigWig test/in/t2.bed /cluster/data/hg19/chrom.sizes t2.bw + +t1.bw: + bedGraphToBigWig test/in/t1.bed /cluster/data/hg19/chrom.sizes t1.bw + +tests:: t1.bw t2.bw bigWigMerge + bigWigMerge t1.bw t2.bw 12merge.bedGraph + diff 12merge.bedGraph test/expected/12merge.bedGraph + bigWigMerge t2.bw t1.bw 21merge.bedGraph + diff 21merge.bedGraph test/expected/21merge.bedGraph