e5a054a02e7a80af675a99ba146c27465837f1d8
markd
  Thu Dec 21 10:13:23 2023 -0800
more work on running tests in parallel

diff --git src/hg/autoSql/tests/makefile src/hg/autoSql/tests/makefile
index b5efa4c..93617a0 100644
--- src/hg/autoSql/tests/makefile
+++ src/hg/autoSql/tests/makefile
@@ -1,136 +1,136 @@
 kentSrc = ../../..
 include ../../../inc/common.mk
 
 #This was making warnings not happen
 #HG_WARN = ${HG_WARN_ERR}
 
 AUTOSQL = ${DESTBINDIR}/autoSql
 AUTOSQLJSON = ${AUTOSQL} -json
 DIFF = diff -u
 XINC = -I.
 
 L += -lm
 MYLIBDIR = ../../../lib/${MACHTYPE}
 MYLIBS =  ${MYLIBDIR}/jkhgap.a ${MYLIBDIR}/jkweb.a
 
 # .as not used as dependencies, as we want to run everything each time
 test:   hardTest  newTest  polyTest  simpleTest mainTest doc doc2 \
         testHarness dbLinkTest symTest symColsTest jsonTest
 
 # hardTest
 hardTest: mkout
 	${AUTOSQL} input/hardTest.as output/hardTest
 	${DIFF} expected/hardTest.sql output/hardTest.sql
 	${DIFF} expected/hardTest.h   output/hardTest.h  
 	${DIFF} expected/hardTest.c   output/hardTest.c  
 
 # newTest
 newTest: mkout
 	${AUTOSQL} -dbLink input/newTest.as output/newTest 2>output/newTest.err
 	${DIFF} expected/newTest.sql output/newTest.sql
 	${DIFF} expected/newTest.h   output/newTest.h  
 	${DIFF} expected/newTest.c   output/newTest.c  
 	${DIFF} expected/newTest.err   output/newTest.err
 
 # polyTest
 polyTest: mkout
 	${AUTOSQL} input/polyTest.as output/polyTest
 	${DIFF} expected/polyTest.sql output/polyTest.sql
 	${DIFF} expected/polyTest.h   output/polyTest.h  
 	${DIFF} expected/polyTest.c   output/polyTest.c  
 
 # simpleTest
 simpleTest: mkout
 	${AUTOSQL} input/simpleTest.as output/simpleTest
 	${DIFF} expected/simpleTest.sql output/simpleTest.sql
 	${DIFF} expected/simpleTest.h   output/simpleTest.h  
 	${DIFF} expected/simpleTest.c   output/simpleTest.c  
 
 # test
 mainTest: mkout
 	${AUTOSQL} input/mainTest.as output/mainTest
 	${DIFF} expected/mainTest.sql output/mainTest.sql
 	${DIFF} expected/mainTest.h   output/mainTest.h  
 	${DIFF} expected/mainTest.c   output/mainTest.c  
 
 # doc
 doc: mkout
 	${AUTOSQLJSON} input/doc.as output/doc
 	${DIFF} expected/doc.sql output/doc.sql
 	${DIFF} expected/doc.h   output/doc.h  
 	${DIFF} expected/doc.c   output/doc.c  
 
 # doc2
 doc2: mkout
 	${AUTOSQLJSON} input/doc2.as output/doc2
 	${DIFF} expected/doc2.sql output/doc2.sql
 	${DIFF} expected/doc2.h   output/doc2.h  
 	${DIFF} expected/doc2.c   output/doc2.c  
 
 # 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/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/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: testSymCols.o output/symTest.o
-	${CC} -o testSymCols testSymCols.o output/symTest.o ${MYLIBS} ${MYSQLLIBS} ${L}
+symColsTest: output/symTest.o
+	${CC} ${ALL_CC_OPTS} -o testSymCols testSymCols.c output/symTest.o ${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
 
 # test of JSON output
-jsonTest: output/doc.o output/doc2.o jsonTest.o
-	${CC} -o jsonTest jsonTest.o output/doc.o output/doc2.o ${MYLIBS} ${MYSQLLIBS} ${L}
+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/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