On 2018-06-20 14:35, Martin Liška wrote:
> On 06/20/2018 02:19 PM, Tom de Vries wrote:
>> Hi,
>>
>> for make check-fixincludes I'm seeing:
>> ...
>> cmp: EOF on
>> /home/vries/gcc_versions/devel/src/fixincludes/tests/base/ioLib.h
>> *** ioLib.h     2018-06-20 14:14:40.035956737 +0200
>> --- /home/vries/gcc_versions/devel/src/fixincludes/tests/base/ioLib.h
>> 2018-06-20 14:14:28.183925247 +0200
>> ***************
>> *** 17,24 ****
>>   #if defined( VXWORKS_WRITE_CONST_CHECK )
>>   extern int  write (int, const char*, size_t);
>>   #endif  /* VXWORKS_WRITE_CONST_CHECK */
>> -
>> -
>> - #if defined( VXWORKS_IOLIB_INCLUDE_UNISTD_CHECK )
>> - #include "unistd.h"
>> - #endif  /* VXWORKS_IOLIB_INCLUDE_UNISTD_CHECK */
>> --- 17,19 ----
>>
>> There were fixinclude test FAILURES
>> Makefile:176: recipe for target 'check' failed
>> make: *** [check] Error 1
>> ...
>>
>> Thanks,
>> - Tom
>>
> 
> I can confirm that.

Sorry about that. I completely missed that part of the README. I also
get the test failure now that I do the make check. BUT: The hunk I'm
seeing has <unistd.h>, not "unistd.h", which is also what I'd expect,
since that's how it should look after fixing.

Ah, it seems that fixincl.x was not regenerated when the inclhack.def
patch was applied, which is probably my fault as well, since I hadn't
included a proper changelog fragment.

Fortunately it seems that the fix is simply to add that hunk (with the
angle brackets) to tests/base/ioLib.h, now that fixincl.x has been
regenerated due to a later patch.

Again, sorry about all this (and for not responding sooner, but have
been on vacation).

Rasmus

Reply via email to