5f6b4fa86cd975502de93a57756260ea22f15a22 braney Thu Oct 1 09:45:34 2026 -0700 bedItemRgbTest: the on run sets alwaysItemRgb on by name, refs #36212, #38185 The on conf only included ~/.hg.conf and relied on the default. A developer whose conf chain turns alwaysItemRgb off got it off in both runs, and the test failed. diff --git src/hg/cgilib/tests/makefile src/hg/cgilib/tests/makefile index b4cd77c4595..d154426b0bd 100644 --- src/hg/cgilib/tests/makefile +++ src/hg/cgilib/tests/makefile @@ -1,42 +1,43 @@ kentSrc = ../../.. include ../../../inc/common.mk L += ${MYSQLLIBS} -lm MYLIBDIR = ../../../lib/${MACHTYPE} MYLIBS = ${MYLIBDIR}/jkhgapcgi.a ${MYLIBDIR}/jkhgap.a ${MYLIBDIR}/jkweb.a BIN_DIR = bin/${MACHTYPE} all: ${BIN_DIR}/annoGratorTester # annoGratorTest is left out: it needs assemblies and tables this directory cannot assume. # Until bedItemRgbTest arrived (refs #38391) that made `make test` here a no-op that printed # "tested all", which hg/makefile has been running all along through TEST_EXTRA. #test: annoGratorTest test: bedItemRgbTest rm -rf output echo tested all mkdirs: @${MKDIR} output ${BIN_DIR} # Two runs, because the last step of the rule reads hg.conf's alwaysItemRgb and a mirror may -# turn it off. +# turn it off. The on conf sets it on by name, because the developer's conf may turn it off. bedItemRgbTest: mkdirs ${CC} ${CC_PROG_OPTS} -o ${BIN_DIR}/bedItemRgbTester bedItemRgbTester.c ${MYLIBS} $L echo "include ${HOME}/.hg.conf" > output/rgbOn.conf + echo "alwaysItemRgb=on" >> output/rgbOn.conf echo "include ${HOME}/.hg.conf" > output/rgbOff.conf echo "alwaysItemRgb=off" >> output/rgbOff.conf HGDB_CONF=output/rgbOn.conf ${BIN_DIR}/bedItemRgbTester > output/bedItemRgbTest HGDB_CONF=output/rgbOff.conf ${BIN_DIR}/bedItemRgbTester >> output/bedItemRgbTest diff expected/bedItemRgbTest output/bedItemRgbTest annoGratorTest: ${BIN_DIR}/annoGratorTester mkdirs ${MAKE} -f annoGratorTests.mk test ${BIN_DIR}/annoGratorTester: annoGratorTester.o ${MYLIBS} @${MKDIR} ${BIN_DIR} ${CC} ${COPT} ${CFLAGS} -o $@ $< ${MYLIBS} ${L} clean: rm -rf *.o bin output *.tmp loader udcCache