576f9b015b0d3df408c6f1323b7247096c80193f max Wed Jan 22 05:04:30 2025 -0800 broke the build, fixing customTrackTester, refs #35085 diff --git src/hg/lib/tests/customTrackTester.c src/hg/lib/tests/customTrackTester.c index 35be9acbfea..b9e455fe6ae 100644 --- src/hg/lib/tests/customTrackTester.c +++ src/hg/lib/tests/customTrackTester.c @@ -28,61 +28,61 @@ } static struct optionSpec optionSpecs[] = { {"db", OPTION_STRING}, {NULL, 0} }; static void parseCustomTracks(char *db, char *inFile, char *trashFile) /* parse tracks from input file, and also from trashfile if not null */ { char *text; struct customTrack *ctList = NULL, *oldCts = NULL; readInGulp(inFile, &text, NULL); /* read new CT's from input */ -ctList = customFactoryParse(db, text, FALSE, NULL); +ctList = customFactoryParse(db, text, FALSE, NULL, NULL); verbose(3, "parsed %d tracks from %s\n", slCount(ctList), inFile); if (trashFile) { /* read old CT's from trash file */ - oldCts = customFactoryParse(db, trashFile, TRUE, NULL); + oldCts = customFactoryParse(db, trashFile, TRUE, NULL, NULL); /* merge old and new */ ctList = customTrackAddToList(ctList, oldCts, NULL, TRUE); } /* save to new trash file */ static struct tempName tn; makeTempName(&tn, "ctTest", ".bed"); customTracksSaveFile(db, ctList, tn.forCgi); /* reload from new trash file */ ctList = NULL; -ctList = customFactoryParse(db, tn.forCgi, TRUE, NULL); +ctList = customFactoryParse(db, tn.forCgi, TRUE, NULL, NULL); customTracksSaveFile(db, ctList, "stdout"); /* cleanup */ unlink(tn.forCgi); } static void checkCustomTracks(char *db, char *outFile, char *expectedFile) /* compare track lines of output file with expected. Return error * settings are not a proper subset */ { struct hash *expHash = hashNew(0); struct customTrack *ct = NULL, *expCt = NULL; -struct customTrack *newCts = customFactoryParse(db, outFile, TRUE, NULL); -struct customTrack *expCts = customFactoryParse(db, expectedFile, TRUE, NULL); +struct customTrack *newCts = customFactoryParse(db, outFile, TRUE, NULL, NULL); +struct customTrack *expCts = customFactoryParse(db, expectedFile, TRUE, NULL, NULL); verbose(3, "found %d tracks in output file %s, %d tracks in expected file %s\n", slCount(newCts), outFile, slCount(expCts), expectedFile); for (ct = expCts; ct != NULL; ct = ct->next) hashAdd(expHash, ct->tdb->track, ct); for (ct = newCts; ct != NULL; ct = ct->next) { if ((expCt = hashFindVal(expHash, ct->tdb->track)) == NULL) errAbort("ct %s not found in expected", ct->tdb->track); verbose(3, "output settings: %s %s\n%s\n", ct->tdb->track, ct->tdb->shortLabel, ct->tdb->settings); verbose(3, "expected settings: %s %s\n%s\n", expCt->tdb->track, expCt->tdb->shortLabel, expCt->tdb->settings); struct hash *newSettings = trackDbHashSettings(ct->tdb); struct hash *expSettings = trackDbHashSettings(expCt->tdb); struct hashCookie hc = hashFirst(expSettings);