On Sat, 24 Jan 2015, Aaron Ecay wrote: > Hi Chuck, > > 2015ko urtarrilak 24an, "Charles C. Berry"-ek idatzi zuen: >> All tests passed (modulo a few shell and fortran issues unique to my setup >> which also failed for master). >> >> Then I did an update and `git merge master' and got a pile of errors due to >> >> commit fda70440f49292197d76ce4c2727dbf426bc65f3 >> Author: Aaron Ecay >> Date: Thu Jan 22 00:59:04 2015 -0500 >> >> which explicitly tests for conformity to the old inline regime or >> at least depends on it. > > By “pile of errors” do you mean test failures or merge conflicts? > AFAICS the patches you sent to the list did not touch the test suite, so > there should not be merge conflicts. But maybe you had a patch for the > tests that you didn’t send. (If I somehow caused merge conflicts for > your patches, I would offer to help fix them.) > > The test suite depends on the specific way in which inline results > are inserted, so it will need to be updated to take account of your > change. `test failures' is what I meant - sorry for being vague. No merge issues. I will mostly have to edit in the `{{{results(' `)}}}' wrappers in the places where the expected results are specified or specify [:results ...] to make the result agree with the specification, I guess. Thanks for your commit, BTW. I was feeling guilty about not having any tests, so my conscience is off the hook now. Chuck