[Piglit] [PATCH] framework: fix binary assignment for shader_runner

[Marek Olšák]

On Tue, Aug 23, 2016 at 7:48 PM, Dylan Baker <dylan at pnwbakers.com> wrote:
> Quoting Marek Olšák (2016-08-23 00:48:03)
>> On Tue, Aug 23, 2016 at 2:24 AM, Michel Dänzer <michel at daenzer.net> wrote:
>> > On 22/08/16 11:11 PM, Marek Olšák wrote:
>> >> On Wed, Aug 10, 2016 at 7:42 PM, Dylan Baker <dylan at pnwbakers.com> wrote:
>> >>> I've pushed this with Michel's Tested by, since piglit is broken without
>> >>> this. If anyone else has issues we can fix them in new patches.
>> >>
>> >> Actually, the patch breaks piglit here. Reverting the patch fixes the
>> >> problem for me.
>> >
>> > What does "breaks piglit" mean? What are the symptoms?
>>
>> This:
>>
>> /home/marek/dev/piglit/framework/test/opengl.py:400: UserWarning: Fast
>> Skipping Disabled
>>   warnings.warn('Fast Skipping Disabled')
>> Traceback (most recent call last):
>>   File "./piglit", line 170, in <module>
>>     main()
>>   File "./piglit", line 165, in main
>>     returncode = parsed.func(args)
>>   File "/home/marek/dev/piglit/framework/exceptions.py", line 51, in _inner
>>     func(*args, **kwargs)
>>   File "/home/marek/dev/piglit/framework/programs/run.py", line 295, in run
>>     profile = framework.profile.merge_test_profiles(args.test_profile)
>>   File "/home/marek/dev/piglit/framework/profile.py", line 520, in
>> merge_test_profiles
>>     profile = load_test_profile(profiles.pop())
>>   File "/home/marek/dev/piglit/framework/profile.py", line 498, in
>> load_test_profile
>>     os.path.splitext(os.path.basename(filename))[0]))
>>   File "/usr/lib/python3.5/importlib/__init__.py", line 126, in import_module
>>     return _bootstrap._gcd_import(name[level:], package, level)
>>   File "<frozen importlib._bootstrap>", line 986, in _gcd_import
>>   File "<frozen importlib._bootstrap>", line 969, in _find_and_load
>>   File "<frozen importlib._bootstrap>", line 958, in _find_and_load_unlocked
>>   File "<frozen importlib._bootstrap>", line 673, in _load_unlocked
>>   File "<frozen importlib._bootstrap_external>", line 665, in exec_module
>>   File "<frozen importlib._bootstrap>", line 222, in _call_with_frames_removed
>>   File "/home/marek/dev/piglit/tests/quick.py", line 9, in <module>
>>     from tests.all import profile
>>   File "/home/marek/dev/piglit/tests/all.py", line 222, in <module>
>>     test = ShaderTest(os.path.join(dirpath, filename))
>>   File "/home/marek/dev/piglit/framework/test/shader_test.py", line
>> 135, in __init__
>>     glsl_es_version=glsl_es_version if sl_op not in ['<', '<='] else None)
>>   File "/home/marek/dev/piglit/framework/test/opengl.py", line 394, in __init__
>>     super(FastSkipMixinDisabled, self).__init__(*args, **kwargs)
>>   File "/home/marek/dev/piglit/framework/test/piglit_test.py", line
>> 65, in __init__
>>     super(PiglitBaseTest, self).__init__(command, run_concurrent, **kwargs)
>> TypeError: __init__() got an unexpected keyword argument 'glsl_es_version'
>>
>> Marek
>
> You might be interested in this patch:
> https://patchwork.freedesktop.org/patch/105473/

Thanks. That seems to fix the issue.

Marek