From: Christian Weisgerber <naddy@mips.inka.de>
Subject: Re: Got sometimes merges unrelated changes
To: gameoftrees@openbsd.org
Date: Mon, 24 May 2021 22:09:38 +0200

Stefan Sperling:

> As a first step, I'd like to commit the test case below as an 'xfail' test,
> even though the embedded test data is C code which looks ugly and confusing
> when embedded into a shell script like this...

Well, I don't see why a test couldn't have an extra data file.
Or you could start each line with some marker character and trim
it off before use:
  sed -e 's/^X//' > $testroot/repo/reference.c <<EOF

But I think the current embedding is fine.

> +	if [ "$ret" != "0" ]; then
> +		diff -u $testroot/diff.expected $testroot/diff
> +		ret="xfail cherrypick results in unexpected diff"
> +		test_done "$testroot" "$ret"
> +		return 1
> +	fi

Shouldn't an xfail NOT return failure, i.e., return 0?

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de