summaryrefslogtreecommitdiff
path: root/generated_tests
diff options
context:
space:
mode:
authorDylan Baker <baker.dylan.c@gmail.com>2015-02-23 13:53:10 -0800
committerDylan Baker <baker.dylan.c@gmail.com>2015-02-23 15:47:10 -0800
commit27cea0df708fdd13edeaadacc0b8ca8b768616b9 (patch)
tree0ebe3c91e6e50018743f26a82e29e6a894931e92 /generated_tests
parent13770974f4b93c89314d58ad1f20e8bf502dfbfa (diff)
generated tests: Use __future__ division
This coverts all of the generators to use python3 style division. None of these generators are currently affected by this change (generally the author of the generator has taken pains to ensure that python2 division does the right thing by explicitly converting between int and float), but it should reduce surprise to future modifiers, which is good. v2: - add this patch Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Diffstat (limited to 'generated_tests')
-rw-r--r--generated_tests/builtin_function.py2
-rw-r--r--generated_tests/builtin_function_fp64.py2
-rw-r--r--generated_tests/gen_builtin_packing_tests.py2
-rw-r--r--generated_tests/gen_builtin_uniform_tests.py2
-rw-r--r--generated_tests/gen_builtin_uniform_tests_fp64.py2
-rw-r--r--generated_tests/gen_cl_math_builtins.py2
-rw-r--r--generated_tests/gen_cl_relational_builtins.py2
-rw-r--r--generated_tests/gen_cl_store_tests.py2
-rw-r--r--generated_tests/gen_const_builtin_equal_tests.py2
-rw-r--r--generated_tests/gen_constant_array_size_tests.py2
-rw-r--r--generated_tests/gen_constant_array_size_tests_fp64.py2
-rw-r--r--generated_tests/gen_interpolation_tests.py2
-rw-r--r--generated_tests/gen_non-lvalue_tests.py2
-rw-r--r--generated_tests/gen_outerproduct_invalid_params.py2
-rw-r--r--generated_tests/gen_outerproduct_tests.py2
-rw-r--r--generated_tests/gen_shader_bit_encoding_tests.py2
-rw-r--r--generated_tests/gen_shader_image_load_store_tests.py2
-rw-r--r--generated_tests/gen_shader_precision_tests.py2
-rw-r--r--generated_tests/gen_texture_lod_tests.py2
-rw-r--r--generated_tests/gen_texture_query_lod_tests.py2
-rw-r--r--generated_tests/gen_uniform_initializer_tests.py2
-rw-r--r--generated_tests/genclbuiltins.py2
-rw-r--r--generated_tests/interpolation-qualifier-built-in-variable.py2
23 files changed, 23 insertions, 23 deletions
diff --git a/generated_tests/builtin_function.py b/generated_tests/builtin_function.py
index 6fe153db3..4f9bf478a 100644
--- a/generated_tests/builtin_function.py
+++ b/generated_tests/builtin_function.py
@@ -48,7 +48,7 @@
# swizzling, the function call operator, assignment, and the sequence
# operator.
-from __future__ import print_function
+from __future__ import print_function, division
import collections
import itertools
import functools
diff --git a/generated_tests/builtin_function_fp64.py b/generated_tests/builtin_function_fp64.py
index 606b0803a..532790409 100644
--- a/generated_tests/builtin_function_fp64.py
+++ b/generated_tests/builtin_function_fp64.py
@@ -48,7 +48,7 @@
# swizzling, the function call operator, assignment, and the sequence
# operator.
-from __future__ import print_function
+from __future__ import print_function, division
import collections
import itertools
import functools
diff --git a/generated_tests/gen_builtin_packing_tests.py b/generated_tests/gen_builtin_packing_tests.py
index 93858a171..99e83188e 100644
--- a/generated_tests/gen_builtin_packing_tests.py
+++ b/generated_tests/gen_builtin_packing_tests.py
@@ -32,7 +32,7 @@ denormalized) floating point numbers.
"""
-from __future__ import print_function
+from __future__ import print_function, division
import math
import optparse
import os
diff --git a/generated_tests/gen_builtin_uniform_tests.py b/generated_tests/gen_builtin_uniform_tests.py
index 8347b1c28..ba0022b89 100644
--- a/generated_tests/gen_builtin_uniform_tests.py
+++ b/generated_tests/gen_builtin_uniform_tests.py
@@ -44,7 +44,7 @@
# With the optional argument --names-only, it only outputs the names
# of the files; it doesn't generate them.
-from __future__ import print_function
+from __future__ import print_function, division
from builtin_function import *
import abc
import numpy
diff --git a/generated_tests/gen_builtin_uniform_tests_fp64.py b/generated_tests/gen_builtin_uniform_tests_fp64.py
index 6730eec45..7d7684191 100644
--- a/generated_tests/gen_builtin_uniform_tests_fp64.py
+++ b/generated_tests/gen_builtin_uniform_tests_fp64.py
@@ -44,7 +44,7 @@
# With the optional argument --names-only, it only outputs the names
# of the files; it doesn't generate them.
-from __future__ import print_function
+from __future__ import print_function, division
from builtin_function_fp64 import *
import abc
import numpy
diff --git a/generated_tests/gen_cl_math_builtins.py b/generated_tests/gen_cl_math_builtins.py
index d4ec3b834..3321f3c12 100644
--- a/generated_tests/gen_cl_math_builtins.py
+++ b/generated_tests/gen_cl_math_builtins.py
@@ -23,7 +23,7 @@
# Aaron Watry <awatry@gmail.com>
#
-from __future__ import print_function
+from __future__ import print_function, division
import os
from genclbuiltins import gen, NEGNAN
diff --git a/generated_tests/gen_cl_relational_builtins.py b/generated_tests/gen_cl_relational_builtins.py
index 81427150c..00df5379b 100644
--- a/generated_tests/gen_cl_relational_builtins.py
+++ b/generated_tests/gen_cl_relational_builtins.py
@@ -23,7 +23,7 @@
# Aaron Watry <awatry@gmail.com>
#
-from __future__ import print_function
+from __future__ import print_function, division
import os
from genclbuiltins import gen, TRUE, NEGNAN
diff --git a/generated_tests/gen_cl_store_tests.py b/generated_tests/gen_cl_store_tests.py
index bc5ed964b..091d1546d 100644
--- a/generated_tests/gen_cl_store_tests.py
+++ b/generated_tests/gen_cl_store_tests.py
@@ -23,7 +23,7 @@
#
#
-from __future__ import print_function
+from __future__ import print_function, division
import os
import textwrap
diff --git a/generated_tests/gen_const_builtin_equal_tests.py b/generated_tests/gen_const_builtin_equal_tests.py
index 47a238c9b..6e8d984d1 100644
--- a/generated_tests/gen_const_builtin_equal_tests.py
+++ b/generated_tests/gen_const_builtin_equal_tests.py
@@ -20,7 +20,7 @@
""" Generate tests for builtin const equality tests """
-from __future__ import print_function
+from __future__ import print_function, division
import re
import os
diff --git a/generated_tests/gen_constant_array_size_tests.py b/generated_tests/gen_constant_array_size_tests.py
index a239405f9..ea3b2edfd 100644
--- a/generated_tests/gen_constant_array_size_tests.py
+++ b/generated_tests/gen_constant_array_size_tests.py
@@ -34,7 +34,7 @@
# With the optional argument --names-only, it only outputs the names
# of the files; it doesn't generate them.
-from __future__ import print_function
+from __future__ import print_function, division
from builtin_function import *
import abc
import optparse
diff --git a/generated_tests/gen_constant_array_size_tests_fp64.py b/generated_tests/gen_constant_array_size_tests_fp64.py
index 348ec77c4..6a28ff44d 100644
--- a/generated_tests/gen_constant_array_size_tests_fp64.py
+++ b/generated_tests/gen_constant_array_size_tests_fp64.py
@@ -34,7 +34,7 @@
# With the optional argument --names-only, it only outputs the names
# of the files; it doesn't generate them.
-from __future__ import print_function
+from __future__ import print_function, division
from builtin_function_fp64 import *
import abc
import optparse
diff --git a/generated_tests/gen_interpolation_tests.py b/generated_tests/gen_interpolation_tests.py
index a747b6497..a6b7f334e 100644
--- a/generated_tests/gen_interpolation_tests.py
+++ b/generated_tests/gen_interpolation_tests.py
@@ -67,7 +67,7 @@ This program outputs, to stdout, the name of each file it generates.
"""
-from __future__ import print_function
+from __future__ import print_function, division
import os
from six.moves import range
diff --git a/generated_tests/gen_non-lvalue_tests.py b/generated_tests/gen_non-lvalue_tests.py
index de785c9f7..880f34c4a 100644
--- a/generated_tests/gen_non-lvalue_tests.py
+++ b/generated_tests/gen_non-lvalue_tests.py
@@ -21,7 +21,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-from __future__ import print_function
+from __future__ import print_function, division
import os
import itertools
diff --git a/generated_tests/gen_outerproduct_invalid_params.py b/generated_tests/gen_outerproduct_invalid_params.py
index bdf03d630..1fba39c46 100644
--- a/generated_tests/gen_outerproduct_invalid_params.py
+++ b/generated_tests/gen_outerproduct_invalid_params.py
@@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-from __future__ import print_function
+from __future__ import print_function, division
import os
from templates import template_file
diff --git a/generated_tests/gen_outerproduct_tests.py b/generated_tests/gen_outerproduct_tests.py
index 7fd6eb24f..7346814b6 100644
--- a/generated_tests/gen_outerproduct_tests.py
+++ b/generated_tests/gen_outerproduct_tests.py
@@ -20,7 +20,7 @@
""" Generate glsl 1.20 outerproduct tests """
-from __future__ import print_function
+from __future__ import print_function, division
import os
import itertools
import collections
diff --git a/generated_tests/gen_shader_bit_encoding_tests.py b/generated_tests/gen_shader_bit_encoding_tests.py
index 5eda4b414..b3f4f968a 100644
--- a/generated_tests/gen_shader_bit_encoding_tests.py
+++ b/generated_tests/gen_shader_bit_encoding_tests.py
@@ -21,7 +21,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-from __future__ import print_function
+from __future__ import print_function, division
import struct
import os
from operator import neg
diff --git a/generated_tests/gen_shader_image_load_store_tests.py b/generated_tests/gen_shader_image_load_store_tests.py
index 1ffa078e8..77dfe5961 100644
--- a/generated_tests/gen_shader_image_load_store_tests.py
+++ b/generated_tests/gen_shader_image_load_store_tests.py
@@ -21,7 +21,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-from __future__ import print_function
+from __future__ import print_function, division
import os.path
from mako.template import Template
from textwrap import dedent
diff --git a/generated_tests/gen_shader_precision_tests.py b/generated_tests/gen_shader_precision_tests.py
index 50fe650b3..4886ed816 100644
--- a/generated_tests/gen_shader_precision_tests.py
+++ b/generated_tests/gen_shader_precision_tests.py
@@ -46,7 +46,7 @@
This program outputs, to stdout, the name of each file it generates.
"""
-from __future__ import print_function
+from __future__ import print_function, division
from builtin_function import *
import os
diff --git a/generated_tests/gen_texture_lod_tests.py b/generated_tests/gen_texture_lod_tests.py
index 53b2568fa..fcfe58f81 100644
--- a/generated_tests/gen_texture_lod_tests.py
+++ b/generated_tests/gen_texture_lod_tests.py
@@ -20,7 +20,7 @@
""" Generate spec/ARB_shader_texture_lod tests """
-from __future__ import print_function
+from __future__ import print_function, division
import os
import collections
diff --git a/generated_tests/gen_texture_query_lod_tests.py b/generated_tests/gen_texture_query_lod_tests.py
index 40e3471ae..4d673ff95 100644
--- a/generated_tests/gen_texture_query_lod_tests.py
+++ b/generated_tests/gen_texture_query_lod_tests.py
@@ -21,7 +21,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-from __future__ import print_function
+from __future__ import print_function, division
import os
import os.path
diff --git a/generated_tests/gen_uniform_initializer_tests.py b/generated_tests/gen_uniform_initializer_tests.py
index 84b34b5b2..375cb4137 100644
--- a/generated_tests/gen_uniform_initializer_tests.py
+++ b/generated_tests/gen_uniform_initializer_tests.py
@@ -21,7 +21,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-from __future__ import print_function
+from __future__ import print_function, division
import os
from six.moves import range
diff --git a/generated_tests/genclbuiltins.py b/generated_tests/genclbuiltins.py
index 8d934783d..9226085d5 100644
--- a/generated_tests/genclbuiltins.py
+++ b/generated_tests/genclbuiltins.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, division
import os
import six
diff --git a/generated_tests/interpolation-qualifier-built-in-variable.py b/generated_tests/interpolation-qualifier-built-in-variable.py
index a18abc4bd..3ccd0441c 100644
--- a/generated_tests/interpolation-qualifier-built-in-variable.py
+++ b/generated_tests/interpolation-qualifier-built-in-variable.py
@@ -23,7 +23,7 @@
"""Generate interpolation-qualifier tests."""
-from __future__ import print_function
+from __future__ import print_function, division
import os
import itertools