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

[Chad Versace]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJOwEZ/AAoJEAIvNt057x8iUFMQAINkTHddk6sr+orMEmrndTV5
5g+p1CsdJ1VjVPDijPS0hhzC17O0eQ2rbc89B6xZV5Z+jKAxh7yLiBHaqRfgmcOX
7tRVrVceV/zDaI9x090jAbjzkbpEg+ySBBuOIzgJNfvTv9PecPme6OzBbCQ8OCcB
DCO6x8SDnXzfoq4IcHWKETbxB3qJep/IxikOpXIgL5uquyQqw0qaGRu2O3Njezck
msoGXfHzsG0SPZHsaha8MY57HrQ9h7elYnHoUZQsiIxUkaSU1TqzvDe92aG18Fy5
5b76906SItsFrUWxb7CU2fG9G6ybJZHjHpnhAfy9oOs8fpREdpyKv9QShznVNVlq
vaE6twbvFXJkCJf2nIUROda5BnNnJhB1M5XKIoFVa24LGAijF+WfUssDIkBhtW07
LNcMPEd3KOohKgpqHoos279cYIkshE4q6mGlKNrV6sG3gRb5xAh2ipOkq8/yQwAl
Vch/2fvZgvcqAAnkNl0Lcrrv5q26Tgm4WiQ5eM+Dt7CFBQUAWLDFfoLsFyEif5Lm
KvWkFqqZqZitny9ZfxCS4gIuWUjmZgDsu5G2iJFa09bQnzErMZJA02XQmPlJDXnW
TOkSrxQKOqmrSqSBa9YPEzsxhNRVhlz0T13pv1iH7rVybYL+mpw3pBGKZLzGxWPx
Y9G/KZMT0tRC5FKAAP33
=8juT
-----END PGP SIGNATURE-----