ad288366c695a813ac9882b0279aeeeafbec4bf5 markd Fri Dec 22 09:23:21 2023 -0800 fixed building some test.o files, do this in a very straight-foward way now diff --git src/hg/autoSql/tests/makefile src/hg/autoSql/tests/makefile index 93617a0..9d9c85e 100644 --- src/hg/autoSql/tests/makefile +++ src/hg/autoSql/tests/makefile @@ -69,68 +69,63 @@ # index index: mkout ${AUTOSQL} input/index.as output/index ${DIFF} expected/index.sql output/index.sql # bin binTest: mkout ${AUTOSQL} -addBin input/binTest.as output/binTest ${DIFF} expected/binTest.sql output/binTest.sql ${DIFF} expected/binTest.c output/binTest.c ${DIFF} expected/binTest.h output/binTest.h # testHarness -testHarness: output/mainTest.o testHarness.o - ${CC} -o testHarness testHarness.o output/mainTest.o ${MYLIBS} ${MYSQLLIBS} ${L} +testHarness: output/mainTest.c + ${CC} ${CC_PROG_OPTS} -o testHarness testHarness.c output/mainTest.c ${MYLIBS} ${MYSQLLIBS} ${L} ./testHarness > output/testHarness.out ${DIFF} expected/testHarness.out output/testHarness.out output/mainTest.c: mainTest -testHarness.o: mainTest # dbLinkTest: -dbLinkTest: output/newTest.o dbLinkTest.o - ${CC} -o dbLinkTest dbLinkTest.o output/newTest.o ${MYLIBS} ${MYSQLLIBS} ${L} +dbLinkTest: output/newTest.c + ${CC} ${CC_PROG_OPTS} -o dbLinkTest dbLinkTest.c output/newTest.c ${MYLIBS} ${MYSQLLIBS} ${L} ./dbLinkTest >& output/dbLinkTest.out ${DIFF} expected/dbLinkTest.out output/dbLinkTest.out output/newTest.c: newTest -dbLinkTest.o: newTest # test of symbolic columns symTest: mkout ${AUTOSQL} input/symTest.as output/symTest 2>output/symTest.err ${DIFF} expected/symTest.sql output/symTest.sql ${DIFF} expected/symTest.h output/symTest.h ${DIFF} expected/symTest.c output/symTest.c ${DIFF} expected/symTest.err output/symTest.err -output/symTest.c: symTest - -symColsTest: output/symTest.o - ${CC} ${ALL_CC_OPTS} -o testSymCols testSymCols.c output/symTest.o ${MYLIBS} ${MYSQLLIBS} ${L} +symColsTest: output/symTest.c + ${CC} ${CC_PROG_OPTS} -o testSymCols testSymCols.c output/symTest.c ${MYLIBS} ${MYSQLLIBS} ${L} ./testSymCols ${DIFF} expected/symColsTest.tab output/symColsTest.tab ${DIFF} expected/symColsTest.tab output/symColsTestComma.tab ${DIFF} expected/symColsTest.tab output/symColsTestDb.tab rm testSymCols -testSymCols.o: output/symTest.c +output/symTest.c: symTest # test of JSON output -jsonTest: output/doc.o output/doc2.o - ${CC} ${ALL_CC_OPTS} -o jsonTest jsonTest.c output/doc.o output/doc2.o ${MYLIBS} ${MYSQLLIBS} ${L} +jsonTest: output/doc.c output/doc2.c + ${CC} ${CC_PROG_OPTS} -o jsonTest jsonTest.c output/doc.c output/doc2.c ${MYLIBS} ${MYSQLLIBS} ${L} ./jsonTest >& output/jsonTest.out ${DIFF} expected/jsonTest.out output/jsonTest.out output/doc.c: doc output/doc2.c: doc2 -jsonTest.o: doc doc2 mkout: @${MKDIR} output clean: rm -rf output *.o testHarness dbLinkTest jsonTest