[PATCH 1/2] Tweak xquery tests so that they pass on OpenBSD

Timo Myyrä timo.myyra@wickedbsd.net
Tue May 9 04:02:00 GMT 2017


Per Bothner <per@bothner.com> writes:

> On 05/07/2017 09:11 PM, Timo Myyrä wrote:
>>
>> OpenBSD's diff doesn't have -B flag so work around it by formatting the
>> expected test outputs to not have newline in the end. 
>
> I'm not comfortable changing checked-in text files so they don't end
> in a newline, like text files should.
>
> Ideally the output should always (or at least by default) end in a newline.
> Perhaps close should automatically call freshLine.  However, you have to
> be careful with binary files - and it becomes non-obvious with hybrid
> text/binary files, which Kawa supports.
>
> So not sure what to do.  It needs some thought.
>
> As a work-round until then, I suggest we add a newline to the end of the output.
> For example:
> 	echo >>tmp-format-users.html
> Or perhaps we can have sed add the newline.

Hmm,
I don't think kawa itself should emit newlines unless its told to. 

As the sed command already strips whitespace besides newlines, could it be just
expanded to zap newlines as well. Or pipe to `tr -d '\n'`.

With XML the formatting doesn't matter so it would probably be easiest to
compare expected output if its formatted as single long string?

Timo



More information about the Kawa mailing list