[PATCH 2/2] Use the correct m32/mx32 st_mtime_nsec check in tests/xstatx.c

[James Clarke]

On 30 Aug 2016, at 16:59, Dmitry V. Levin <ldv at altlinux.org> wrote:
> On Tue, Aug 30, 2016 at 12:50:34AM +0100, James Clarke wrote:
>> * tests/Makefile.am: Define MPERS_IS_m(x)32 for mpers builds.
>> * tests/xstatx.c: Use the correct m32/mx32 and stat/stat64 macros when
>> checking if st_mtime_nsec exists.
>> ---
>> 
>> Hi,
>> This fixes tests-m32 failures for the *stat.c (32-bit native) test cases, as
>> sparc64's stat does not have nsec, but sparc's does, so xstatx.c wasn't
>> printing the nsec (but strace itself was correctly printing it). It doesn't
>> look quite right given there's a whole load of other nsec stuff above it, but
>> it's sufficient on sparc64. I don't expect it to be committed as-is, but
>> hopefully it's helpful.
>> 
>> Regards,
>> James
> 
> I've made a slightly different change based on your patch.  Thanks!

Tested and verified it works, thanks!

>> tests/Makefile.am |  3 +++
>> tests/xstatx.c    | 24 ++++++++++++++++++++++++
>> 2 files changed, 27 insertions(+)
>> 
>> diff --git a/tests/Makefile.am b/tests/Makefile.am
>> index 0c28f06..26d5a3a 100644
>> --- a/tests/Makefile.am
>> +++ b/tests/Makefile.am
>> @@ -38,6 +38,9 @@ AM_CPPFLAGS = $(ARCH_MFLAGS) \
>> 	      -I$(top_srcdir)/$(OS) \
>> 	      -I$(top_builddir) \
>> 	      -I$(top_srcdir)
>> +ifneq ($(MPERS_NAME),)
>> +AM_CPPFLAGS += -DMPERS_IS_$(MPERS_NAME)
>> +endif
> 
> GNU Automake doesn't like this, so I've moved it to ARCH_MFLAGS.

Ah. I tested this by patching Makefile.in instead and didn’t even consider that
Automake wouldn’t like it.

James