ac06c636d23076a08169c7a7d6300757da959bac
braney
  Thu Sep 1 10:15:22 2011 -0700
make tests a little more stand-alone and easier to clean (include chrom.sizes in test dir)
diff --git src/utils/bigWigMerge/makefile src/utils/bigWigMerge/makefile
index 608227d..b434c49 100644
--- src/utils/bigWigMerge/makefile
+++ src/utils/bigWigMerge/makefile
@@ -1,31 +1,32 @@
 include ../../inc/common.mk
 
 L += -lm -lz
 MYLIBDIR = ../../lib/${MACHTYPE}
 MYLIBS =  ${MYLIBDIR}/jkweb.a
+TESTOUT = test/output
+TESTIN = test/in
+TESTEXPECTED = test/expected
 
 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 
+	rm -rf ${TESTOUT}
+
+tests:: bigWigMerge
+	mkdir -p ${TESTOUT}
+	bedGraphToBigWig ${TESTIN}/t2.bed ${TESTIN}/hg19.chrom.sizes ${TESTOUT}/t2.bw
+	bedGraphToBigWig ${TESTIN}/t1.bed ${TESTIN}/hg19.chrom.sizes  ${TESTOUT}/t1.bw
+	bigWigMerge ${TESTOUT}/t1.bw ${TESTOUT}/t2.bw ${TESTOUT}/12merge.bedGraph
+	diff ${TESTOUT}/12merge.bedGraph ${TESTEXPECTED}/12merge.bedGraph 
+	bigWigMerge ${TESTOUT}/t2.bw ${TESTOUT}/t1.bw ${TESTOUT}/21merge.bedGraph
+	diff ${TESTOUT}/21merge.bedGraph ${TESTEXPECTED}/21merge.bedGraph 
+	rm -rf ${TESTOUT}