[Piglit] [PATCH] cl: Fix char/short test names

Aaron Watry awatry at gmail.com
Thu Apr 11 16:11:31 PDT 2013


Several tests still had '%' in the test names, which Tom made an illegal
character a ways back.
---
 tests/cl/program/execute/scalar-arithmetic-char.cl   |   18 +++++++++---------
 tests/cl/program/execute/scalar-arithmetic-short.cl  |   18 +++++++++---------
 tests/cl/program/execute/scalar-arithmetic-uchar.cl  |   10 +++++-----
 tests/cl/program/execute/scalar-arithmetic-ushort.cl |    8 ++++----
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/tests/cl/program/execute/scalar-arithmetic-char.cl b/tests/cl/program/execute/scalar-arithmetic-char.cl
index 3aaf14d..2642a20 100644
--- a/tests/cl/program/execute/scalar-arithmetic-char.cl
+++ b/tests/cl/program/execute/scalar-arithmetic-char.cl
@@ -171,63 +171,63 @@ arg_out: 0 buffer char[1] 0
 ## Modulo ##
 
 [test]
-name: pos%pos=0
+name: pos mod pos=0
 kernel_name: mod
 arg_in:  1 char 8
 arg_in:  2 char 4
 arg_out: 0 buffer char[1] 0
 
 [test]
-name: pos%pos=pos
+name: pos mod pos=pos
 kernel_name: mod
 arg_in:  1 char 8
 arg_in:  2 char 5
 arg_out: 0 buffer char[1] 3
 
 [test]
-name: neg%pos=0
+name: neg mod pos=0
 kernel_name: mod
 arg_in:  1 char -30
 arg_in:  2 char 15
 arg_out: 0 buffer char[1] 0
 
 [test]
-name: neg%pos=neg
+name: neg mod pos=neg
 kernel_name: mod
 arg_in:  1 char -18
 arg_in:  2 char 5
 arg_out: 0 buffer char[1] -3
 
 [test]
-name: pos%neg=0
+name: pos mod neg=0
 kernel_name: mod
 arg_in:  1 char 12
 arg_in:  2 char -4
 arg_out: 0 buffer char[1] 0
 
 [test]
-name: pos%neg=pos
+name: pos mod neg=pos
 kernel_name: mod
 arg_in:  1 char 16
 arg_in:  2 char -3
 arg_out: 0 buffer char[1] 1
 
 [test]
-name: small_pos%big_pos
+name: small_pos mod big_pos
 kernel_name: mod
 arg_in:  1 char 5
 arg_in:  2 char 111
 arg_out: 0 buffer char[1] 5
 
 [test]
-name: max_char%num
+name: max_char mod num
 kernel_name: mod
 arg_in:  1 char 127
 arg_in:  2 char 33
 arg_out: 0 buffer char[1] 28
 
 [test]
-name: min_char%num
+name: min_char mod num
 kernel_name: mod
 arg_in:  1 char -128
 arg_in:  2 char 46
diff --git a/tests/cl/program/execute/scalar-arithmetic-short.cl b/tests/cl/program/execute/scalar-arithmetic-short.cl
index 4b1f595..ab6c479 100644
--- a/tests/cl/program/execute/scalar-arithmetic-short.cl
+++ b/tests/cl/program/execute/scalar-arithmetic-short.cl
@@ -171,63 +171,63 @@ arg_out: 0 buffer short[1] 0
 ## Modulo ##
 
 [test]
-name: pos%pos=0
+name: pos mod pos=0
 kernel_name: mod
 arg_in:  1 short 8
 arg_in:  2 short 4
 arg_out: 0 buffer short[1] 0
 
 [test]
-name: pos%pos=pos
+name: pos mod pos=pos
 kernel_name: mod
 arg_in:  1 short 8
 arg_in:  2 short 5
 arg_out: 0 buffer short[1] 3
 
 [test]
-name: neg%pos=0
+name: neg mod pos=0
 kernel_name: mod
 arg_in:  1 short -30
 arg_in:  2 short 15
 arg_out: 0 buffer short[1] 0
 
 [test]
-name: neg%pos=neg
+name: neg mod pos=neg
 kernel_name: mod
 arg_in:  1 short -18
 arg_in:  2 short 5
 arg_out: 0 buffer short[1] -3
 
 [test]
-name: pos%neg=0
+name: pos mod neg=0
 kernel_name: mod
 arg_in:  1 short 12
 arg_in:  2 short -4
 arg_out: 0 buffer short[1] 0
 
 [test]
-name: pos%neg=pos
+name: pos mod neg=pos
 kernel_name: mod
 arg_in:  1 short 16
 arg_in:  2 short -3
 arg_out: 0 buffer short[1] 1
 
 [test]
-name: small_pos%big_pos
+name: small_pos mod big_pos
 kernel_name: mod
 arg_in:  1 short 5
 arg_in:  2 short 345
 arg_out: 0 buffer short[1] 5
 
 [test]
-name: max_short%num
+name: max_short mod num
 kernel_name: mod
 arg_in:  1 short 32767
 arg_in:  2 short 1234
 arg_out: 0 buffer short[1] 683
 
 [test]
-name: min_short%num
+name: min_short mod num
 kernel_name: mod
 arg_in:  1 short -32768
 arg_in:  2 short 475
diff --git a/tests/cl/program/execute/scalar-arithmetic-uchar.cl b/tests/cl/program/execute/scalar-arithmetic-uchar.cl
index d1c5243..d7e86f8 100644
--- a/tests/cl/program/execute/scalar-arithmetic-uchar.cl
+++ b/tests/cl/program/execute/scalar-arithmetic-uchar.cl
@@ -80,35 +80,35 @@ arg_out: 0 buffer uchar[1] 0
 ## Modulo ##
 
 [test]
-name: pos%pos=0
+name: pos mod pos=0
 kernel_name: mod
 arg_in:  1 uchar 8
 arg_in:  2 uchar 4
 arg_out: 0 buffer uchar[1] 0
 
 [test]
-name: pos%pos=pos
+name: pos mod pos=pos
 kernel_name: mod
 arg_in:  1 uchar 8
 arg_in:  2 uchar 5
 arg_out: 0 buffer uchar[1] 3
 
 [test]
-name: small_pos%big_pos
+name: small_pos mod big_pos
 kernel_name: mod
 arg_in:  1 uchar 5
 arg_in:  2 uchar 103
 arg_out: 0 buffer uchar[1] 5
 
 [test]
-name: max_uchar%num
+name: max_uchar mod num
 kernel_name: mod
 arg_in:  1 uchar 255
 arg_in:  2 uchar 33
 arg_out: 0 buffer uchar[1] 24
 
 [test]
-name: min_uchar%num
+name: min_uchar mod num
 kernel_name: mod
 arg_in:  1 uchar 0
 arg_in:  2 uchar 46
diff --git a/tests/cl/program/execute/scalar-arithmetic-ushort.cl b/tests/cl/program/execute/scalar-arithmetic-ushort.cl
index 38883ba..db2cbbc 100644
--- a/tests/cl/program/execute/scalar-arithmetic-ushort.cl
+++ b/tests/cl/program/execute/scalar-arithmetic-ushort.cl
@@ -87,28 +87,28 @@ arg_in:  2 ushort 4
 arg_out: 0 buffer ushort[1] 0
 
 [test]
-name: pos%pos=pos
+name: pos mod pos=pos
 kernel_name: mod
 arg_in:  1 ushort 8
 arg_in:  2 ushort 5
 arg_out: 0 buffer ushort[1] 3
 
 [test]
-name: small_pos%big_pos
+name: small_pos mod big_pos
 kernel_name: mod
 arg_in:  1 ushort 5
 arg_in:  2 ushort 32001
 arg_out: 0 buffer ushort[1] 5
 
 [test]
-name: max_ushort%num
+name: max_ushort mod num
 kernel_name: mod
 arg_in:  1 ushort 65535
 arg_in:  2 ushort 334
 arg_out: 0 buffer ushort[1] 71
 
 [test]
-name: min_ushort%num
+name: min_ushort mod num
 kernel_name: mod
 arg_in:  1 ushort 0
 arg_in:  2 ushort 3453
-- 
1.7.10.4



More information about the Piglit mailing list