5bb9ea5bace70f537669edc0e53b6322dde07dad galt Sat Oct 27 22:56:36 2018 -0700 adding variant of fetchUrlTest that uses UDC. diff --git src/lib/tests/makefile src/lib/tests/makefile index 93ec0b3..2abe0cc 100644 --- src/lib/tests/makefile +++ src/lib/tests/makefile @@ -2,31 +2,31 @@ include ../../inc/common.mk ifeq (${USE_TABIX},1) TABIX_TESTS=tabixTest vcfTest else TABIX_TESTS= endif MYLIBDIR = ../../lib/${MACHTYPE} MYLIBS = ${MYLIBDIR}/jkweb.a BIN_DIR = bin/${MACHTYPE} test: errCatchTest htmlPageTest htmlExpandUrlTest pipelineTests dyStringTest \ mimeTests base64Tests quotedPTests safeTest hashTest fetchUrlTest gff3Test \ ${TABIX_TESTS} hacTreeTest testSumDoubles - rm -r output fetchUrlTest testSumDoubles + rm -r output fetchUrlTest fetchUrlViaUdcTest testSumDoubles @echo tested all mkdirs: ${MKDIR} output ${BIN_DIR} testSumDoubles: testSumDoubles.o ${MYLIBS} ${CC} ${COPT} -o ./testSumDoubles testSumDoubles.o ${MYLIBS} ${L} errCatchTest: errCatchTest.o ${MYLIBS} mkdirs ${CC} ${COPT} -o ${BIN_DIR}/errCatchTest errCatchTest.o ${MYLIBS} ${L} ${STRIP} ${BIN_DIR}/errCatchTest${EXE} ${BIN_DIR}/errCatchTest secret > output/errCatch.good diff expected/errCatch.good output/errCatch.good ${BIN_DIR}/errCatchTest bad > output/errCatch.bad @@ -222,30 +222,33 @@ ${BIN_DIR}/testHash input/$@.txt > output/$@.out diff expected/$@.out output/$@.out ${BIN_DIR}/testQuotedString: mkdirs testQuotedString.o ${MYLIBS} ${CC} ${COPT} -o ${BIN_DIR}/testQuotedString testQuotedString.o ${MYLIBS} ${L} testQuotedString: ${BIN_DIR}/testQuotedString mkdirs ${BIN_DIR}/testQuotedString -verbose=2 quote this\\ following miniBlat: mkdirs miniBlat.o ${MYLIBS} ${CC} ${COPT} -o miniBlat miniBlat.o ${MYLIBS} ${L} fetchUrlTest: mkdirs fetchUrlTest.o ${MYLIBS} ${CC} ${COPT} -o fetchUrlTest fetchUrlTest.o ${MYLIBS} ${L} +fetchUrlViaUdcTest: mkdirs fetchUrlViaUdcTest.o ${MYLIBS} + ${CC} ${COPT} -o fetchUrlViaUdcTest fetchUrlViaUdcTest.o ${MYLIBS} ${L} + ## # gff3 tests ## gff3Tester=${BIN_DIR}/gff3Tester gff3Test: gff3SacCerTest gff3ErrorCasesTest gff3DiscontiousTest # FIXME: doesn't work yet # gff3SpecialCasesTest gff3SacCerTest: ${gff3Tester} mkdirs ${gff3Tester} input/sacCerTest.gff3 output/$@.out diff expected/$@.out output/$@.out gff3SpecialCasesTest: ${gff3Tester} mkdirs ${gff3Tester} input/specialCasesTest.gff3 output/$@.out diff expected/$@.out output/$@.out @@ -313,23 +316,23 @@ udcTest: udcTest.o ${MYLIBS} mkdirs ${CC} ${COPT} -o ${BIN_DIR}/udcTest udcTest.o ${MYLIBS} ${L} ${BIN_DIR}/udcTest # udc (not part of the top-level test target at this point): udcCacheSizesCheck: udcCacheSizesCheck.o ${MYLIBS} mkdirs ${CC} ${COPT} -o ${BIN_DIR}/udcCacheSizesCheck udcCacheSizesCheck.o ${MYLIBS} ${L} ${BIN_DIR}/udcCacheSizesCheck testOutOfMem: testOutOfMem.o ${MYLIBS} mkdirs ${CC} ${COPT} -o ${BIN_DIR}/testOutOfMem testOutOfMem.o ${MYLIBS} ${L} # we expect this to errAbort because we allocate one byte too much beyond limit -${BIN_DIR}/testOutOfMem 100000 1 clean: - rm -rf *.o bin output *.tmp mimeTester.tmp mimeTester.out fetchUrlTest + rm -rf *.o bin output *.tmp mimeTester.tmp mimeTester.out fetchUrlTest fetchUrlViaUdcTest ${BIN_DIR}/testDecodedString: mkdirs testDecodedString.o ${MYLIBS} ${CC} ${COPT} -o ${BIN_DIR}/testDecodedString testDecodedString.o ${MYLIBS} ${L} testDecodedString: ${BIN_DIR}/testDecodedString mkdirs ${BIN_DIR}/testDecodedString -verbose=2 quote this\\ following