Re: [PATCH 1/2] test-lib: allow using split index in the test suite

From: Thomas Gummerer <t.gummerer@gmail.com>
Date: Mar 20, 2015, 22:12 UTC
Message-ID: <20150320221239.GC6545@hank>
In-Reply-To: <xmqqvbhvcp14.fsf@gitster.dls.corp.google.com>

On 03/20, Junio C Hamano wrote:

Show 14 quoted lines

> Thomas Gummerer <t.gummerer@gmail.com> writes:
>
> > Allow adding a TEST_GIT_TEST_SPLIT_INDEX variable to config.mak to run
> > the test suite with split index enabled.
> >
> > Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
>
> > ---
>
> Hmm, it is not wrong per-se, but would it be too much trouble to do
>
>     GIT_TEST_SPLIT_INDEX=YesPlease make test
>
> or is this doing something a lot more than that?

No that would work as well, I just thought of it as analogous to TEST_GIT_INDEX_VERSION and it might be more convenient to set it once and keep it in the config.mak for some people, to check that split index doesn't break. In any case I do not feel strongly about this.

Show 45 quoted lines

> >  Makefile      | 6 ++++++
> >  t/test-lib.sh | 6 ++++++
> >  2 files changed, 12 insertions(+)
> >
> > diff --git a/Makefile b/Makefile
> > index 44f1dd1..55e558a 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -339,6 +339,9 @@ all::
> >  # with a different indexfile format version.  If it isn't set the index
> >  # file format used is index-v[23].
> >  #
> > +# Define TEST_GIT_TEST_SPLIT_INDEX to 1 to run the test suite with split
> > +# index enabled.
> > +#
> >  # Define GMTIME_UNRELIABLE_ERRORS if your gmtime() function does not
> >  # return NULL when it receives a bogus time_t.
> >  #
> > @@ -2129,6 +2132,9 @@ endif
> >  ifdef TEST_GIT_INDEX_VERSION
> >  	@echo TEST_GIT_INDEX_VERSION=\''$(subst ','\'',$(subst ','\'',$(TEST_GIT_INDEX_VERSION)))'\' >>$@
> >  endif
> > +ifdef TEST_GIT_TEST_SPLIT_INDEX
> > +	@echo TEST_GIT_TEST_SPLIT_INDEX=\''$(subst ','\'',$(subst ','\'',$(TEST_GIT_TEST_SPLIT_INDEX)))'\' >>$@
> > +endif
> >
> >  ### Detect Python interpreter path changes
> >  ifndef NO_PYTHON
> > diff --git a/t/test-lib.sh b/t/test-lib.sh
> > index c096778..477f253 100644
> > --- a/t/test-lib.sh
> > +++ b/t/test-lib.sh
> > @@ -119,6 +119,12 @@ then
> >  	export GIT_INDEX_VERSION
> >  fi
> >
> > +if test -n "${TEST_GIT_TEST_SPLIT_INDEX:+isset}"
> > +then
> > +	GIT_TEST_SPLIT_INDEX="$TEST_GIT_TEST_SPLIT_INDEX"
> > +	export GIT_TEST_SPLIT_INDEX
> > +fi
> > +
> >  # Add libc MALLOC and MALLOC_PERTURB test
> >  # only if we are not executing the test with valgrind
> >  if expr " $GIT_TEST_OPTS " : ".* --valgrind " >/dev/null ||

-- Thomas Gummerer