fa5419167433c0bf67c95aea3bf10d248ca43657 galt Thu Apr 20 14:13:05 2017 -0700 Swapping out the Linus Torvalds version of sha1 from git with a free version not encumbered by license questions. It is smaller and even slightly faster. Maybe compilers have improved. diff --git src/lib/tests/makefile src/lib/tests/makefile index f425988..09522a3 100644 --- src/lib/tests/makefile +++ src/lib/tests/makefile @@ -1,30 +1,30 @@ kentSrc = ../.. 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 gitSha1Test gff3Test \ + mimeTests base64Tests quotedPTests safeTest hashTest fetchUrlTest sha1Test gff3Test \ ${TABIX_TESTS} hacTreeTest testSumDoubles rm -r output fetchUrlTest gitSha1Test @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 @@ -222,32 +222,32 @@ ${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} -gitSha1Test: mkdirs gitSha1Test.o ${MYLIBS} - ${CC} ${COPT} -o gitSha1Test gitSha1Test.o ${MYLIBS} ${L} +sha1Test: mkdirs sha1Test.o ${MYLIBS} + ${CC} ${COPT} -o sha1Test sha1Test.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