[Piglit] [PATCH] (vp)fpgeneric: don't use testBinDir to define path

[Morgan Armand]

On 11/14/2011 1:09 AM, Chad Versace wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> On 11/13/2011 02:53 PM, Morgan Armand wrote:
>> On 11/13/2011 11:36 PM, Chad Versace wrote:
>> On 11/13/2011 10:48 AM, Morgan Armand wrote:
>>>>> This ensures that those tests will work when using outsourced build.
>>>>>
>>>>> ---
>>>>>  tests/all.tests |    4 ++--
>>>>>  1 files changed, 2 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/tests/all.tests b/tests/all.tests
>>>>> index 6bcd3d9..2a85b7a 100644
>>>>> --- a/tests/all.tests
>>>>> +++ b/tests/all.tests
>>>>> @@ -501,7 +501,7 @@ add_plain_test(shaders, 'useshaderprogram-flushverts-1')
>>>>>
>>>>>  fpgeneric = Group()
>>>>>  def add_fpgeneric(name):
>>>>> -	fpgeneric[name] = PlainExecTest(['fp-generic', '-auto', testBinDir + '../tests/shaders/generic/' + name + '.fp'])
>>>>> +	fpgeneric[name] = PlainExecTest(['fp-generic', '-auto', os.path.dirname(__file__) + '/shaders/generic/' + name + '.fp'])
>>>>>  add_fpgeneric('dph')
>>>>>  add_fpgeneric('kil-swizzle')
>>>>>  add_fpgeneric('lrp_sat')
>>>>> @@ -509,7 +509,7 @@ shaders['fp-generic'] = fpgeneric
>>>>>
>>>>>  vpfpgeneric = Group()
>>>>>  def add_vpfpgeneric(name):
>>>>> -	vpfpgeneric[name] = PlainExecTest(['vpfp-generic', '-auto', testBinDir + '../tests/shaders/generic/' + name + '.vpfp'])
>>>>> +	vpfpgeneric[name] = PlainExecTest(['vpfp-generic', '-auto', os.path.dirname(__file__) + '/shaders/generic/' + name + '.vpfp'])
>>>>>  add_vpfpgeneric('arl')
>>>>>  add_vpfpgeneric('big-param')
>>>>>  add_vpfpgeneric('dataflow-bug')
>>
>>
>> Piglit has already solved this problem, as described in the README, section "3. How to run tests". Set the environment variable PIGLIT_BUILD_DIR to the build root, and testBinDir will be overridden appropriately.
>>
>> ----
>> Chad Versace
>> chad.versace at linux.intel.com
>>
>> Chad, I'm not agree with you, but I may be wrong. When using outsourced build, testBinDir
>> would be defined to the PIGLIT_BUILD_DIR/bin directory. However, the test folder is not located
>> into the PIGLIT_BUILD_DIR but with the current test file. Some others tests seems to use the same
>> approach. Please tell me if I miss something.
>>
> 
> Morgan, you are right. I misunderstand the intent of the patch. I though the patch fixed the paths to *binaries* to be executed,
> but now I see that it fixes the paths to *shader sources*.
> 
> Thanks for the fix. Patch is pushed.
> - ----
> Chad Versace
> chad.versace at linux.intel.com
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.11 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
> 
> iQIcBAEBAgAGBQJOwFxHAAoJEAIvNt057x8iikAQAKI8tzlTyrQcCBapwbcpuLb2
> pdRgIjQAWwWEV4PWncKFnkZbeBQinTjoiH7w2BhZPA8NoDFRo26QFAWI3S9WvKLn
> vAa1YDU52tVqlSDo+QvFFLRkpZ5yZAfr9OaXqSZ54SoWMUHZ0JHvWti1gf7ZOoCL
> cA6IlmPxCw/tdyho5BYUyvCd6/IH98387sAWaSJP3RUPOkjYTPwENM40wY9O7iPp
> EwSXl+8a8EQdtU0/kkB9hrkB0NSlpBOIyWcEoFLwsgy/6guKEOoRgVGN8ELzKnaZ
> AU22mm6MVwsofqFCaf2Wc4RWVsd9C26N6X3IPpXqg1gtWIFYbZXhq8q2tWbC3CED
> rNYNlxA9rABfUhPLHlcvd89JalgfTHt4M59jqz/+un1S5kY0eMybFnQQv+t66WDV
> 9FsJWcHj7X96hExtc9N61x2cYW03rgLM06ic+5PukpTmMisVlGj0GH/HRPKD/DWO
> IEAuaDlk15HJvi7LRXEGNi2zE4QuCbwbAnnDUXbzY6CSyVucyVhuQaoIzDJqLk7+
> KCc5SkXFno2Kz9H35/PZ7Byv3UQBPjArjPcNL91YF3CfEdo74Bhz+dJ9xPoEsca2
> c1/r7oQK884W92wGvhRDfcJ8HLK+x4tjgEmZFkBTZNIyTR8vfwlniuTRtENXA6uK
> XVFg/hhBYx6U9zOSP/Pn
> =2Evo
> -----END PGP SIGNATURE-----

Yes, sorry, my description was unclear. I'll pay more attention in the future. Anyway, thank you!