On 2020/02/22 11:54, Alex Naumov wrote:
> This patch updates devel/src from 1.18 to 1.28.
>
> Unfortunately there are a couple of tests failing, which are either related
> to 'fast-export roundtrip' or 'fast-import roundtrip'. I'm not sure if
> these failures are related to OpenBSD, although the code in srctest looks
> sane.
> Maybe somebody from the community can help to improve this patch. The
> faling tests are disabled by commenting out two 'check's. All other tests
> are OK.
I'll commit a tweaked version.
> +Index: Makefile
> +--- Makefile.orig
> ++++ Makefile
> +@@ -13,7 +13,7 @@ SOURCES = README INSTALL COPYING NEWS TODO src srctest
> + all: src.1
> +
> + check: pylint
> +- make pylint
> ++ ${MAKE_PROGRAM} pylint
> + ./srctest -b rcs -p python2
> + ./srctest -b sccs -p python2
> + ./srctest -b rcs -p python3
The combination of this patch + the pre-test command means that running
update-patches after tests changes things, I've changed this to just patching
instead.
> diff --git patches/patch-srctest patches/patch-srctest
> index 56bba19b61b..49342e7835b 100644
> --- patches/patch-srctest
> +++ patches/patch-srctest
> @@ -5,7 +5,25 @@ See upstream merge request
> https://gitlab.com/esr/src/merge_requests/20
> Index: srctest
> --- srctest.orig
> +++ srctest
> -@@ -1492,7 +1492,10 @@ author Eric Sunshine <[email protected]> 1509732
> +@@ -299,7 +299,7 @@ test_export () {
> + cat $srcfi | (cd foo >/dev/null; git init --quiet; git fast-import
> --quiet)
> + (cd foo >/dev/null; git fast-export --all) >$gitfi
> + diff $DIFFOPTS $srcfi $gitfi
> +- check "fast-export roundtrip: $testname"
> ++ #check "fast-export roundtrip: $testname"
> + rm -fr foo
> + }
> +
> +@@ -343,7 +343,7 @@ else
> +
> + $src $TESTOPTS fast-export testfile1 >testfile1.fi &&
> + diff -u filename-git.fi testfile1.fi
> +- check "fast-import roundtrip"
> ++ #check "fast-import roundtrip"
> + fi
> +
> + $src $TESTOPTS move testfile1 newname1
I see why you did it this way (it cancels running tests as soon as there's
a failure) but it's nicer to run everything and report on failures, I've
patched srctest to do that instead. (Also switched the main thing to py3
and got it to run both the py2+py3 tests).
