[Piglit] [PATCH 00/14] Move main() from libpiglitutil into each test

[Brian Paul]

On Fri, Jun 15, 2012 at 12:12 PM, Chad Versace
<chad.versace at linux.intel.com> wrote:
> On 06/15/2012 10:27 AM, Brian Paul wrote:
>> On Fri, Jun 15, 2012 at 11:18 AM, Chad Versace
>> <chad.versace at linux.intel.com> wrote:
>>> On 06/13/2012 10:25 AM, Chad Versace wrote:
>>>> On 06/13/2012 09:06 AM, Brian Paul wrote:
>>>>> On 06/12/2012 05:02 PM, Chad Versace wrote:
>>>
>>>>> Could you check this into a branch first for additional testing (MSVC, mingw32, etc)?
>>>>
>>>> Sure. The series is on my separate-main-v11 branch. I will be posting a v12, v13, etc
>>>> as I incorporate review comments.
>>>>
>>>> Did you also want the series checked into a branch in the origin repo?
>>>
>>> Brian, do you need more time to test the series on Windows? I wanted to commit this soon
>>> if you didn't find any problems.
>>
>> I just grabbed your branch now.  It's failing with mingw32 because of
>> the stdint.h header.  I think I remember you and Jose talking about
>> that.  Is that a patch you can apply to your branch?
>>
>> [  0%] Building C object
>> target_api/gl/tests/util/CMakeFiles/piglitutil.dir/fdo-bitmap.c.obj
>> In file included from
>> /home/brian/projects/piglit-chad/piglit/tests/util/fdo-bitmap.c:4:
>> /home/brian/projects/piglit-chad/piglit/include/msvc/c99/stdint.h:33:2:
>> error: #error "Use this header only with Microsoft Visual C++
>> compilers!"
>
> Hmm... That branch has the fix that Jose suggested.
>
> I've listed the guilty bit of code below. I'm not familiar with Windows,
> so I can't diagnose it. Do you see any apparent problem?
>
> file: CMakeLists.txt
>    if (NOT MSVC)
>        ...
>    else ()
>        include_directories("include/msvc/c99")
>        ...
>    endif()
>
> file: tests/util/piglit-util.h
>    // This include is not in an #ifdef.
>    #include <stdint.h>
>
>
> Since include/msvc/c99 is added to the include directories only when MSVC is
> defined, I don't understand why mingw32 is including it.

OK, the problem is line 144 a bit further down:

if (WIN32)
	include_directories("include/msvc/c99")

Commenting out that line seems to fix things.

-Brian