Update build scripts and vectors test
Bug: 188048203
Test: Manually pushed ocl-test-vectors64 and ran the test
Change-Id: I6b32c9618165c86e335883bd5b95c69a215121fd
diff --git a/Android.bp b/Android.bp
index 352e5fa..f48dae0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -375,7 +375,7 @@
cc_test {
name: "ocl-test-spirv-new",
- srcs: [ "test_conformance/spirv_new/*.cpp", "test_conformance/math_brute_force/reference_math.cpp", "test_conformance/math_brute_force/Utility.cpp" ],
+ srcs: [ "test_conformance/spirv_new/*.cpp", "test_conformance/math_brute_force/reference_math.cpp", "test_conformance/math_brute_force/utility.cpp" ],
data: [ "test_conformance/spirv_new/spirv_asm/*", "test_conformance/spirv_new/spirv_bin/*" ],
defaults: [ "ocl-test-defaults" ],
rtti: false,
@@ -411,17 +411,8 @@
cc_test {
- name: "ocl-test-vec-align",
- srcs: [ "test_conformance/vec_align/*.cpp" ],
- defaults: [ "ocl-test-defaults" ],
- rtti: false,
- gtest: false
-}
-
-
-cc_test {
- name: "ocl-test-vec-step",
- srcs: [ "test_conformance/vec_step/*.cpp" ],
+ name: "ocl-test-vectors",
+ srcs: [ "test_conformance/vectors/*.cpp" ],
defaults: [ "ocl-test-defaults" ],
rtti: false,
gtest: false
diff --git a/scripts/test_opencl_cts.xml b/scripts/test_opencl_cts.xml
index 352e3dc..de9c610 100644
--- a/scripts/test_opencl_cts.xml
+++ b/scripts/test_opencl_cts.xml
@@ -29,8 +29,7 @@
<option key="ocl-test-subgroups" name="push-file" value="/data/nativetest64/unrestricted/ocl-test-subgroups"/>
<option key="ocl-test-svm" name="push-file" value="/data/nativetest64/unrestricted/ocl-test-svm"/>
<option key="ocl-test-thread-dimensions" name="push-file" value="/data/nativetest64/unrestricted/ocl-test-thread-dimensions"/>
- <option key="ocl-test-vec-align" name="push-file" value="/data/nativetest64/unrestricted/ocl-test-vec-align"/>
- <option key="ocl-test-vec-step" name="push-file" value="/data/nativetest64/unrestricted/ocl-test-vec-step"/>
+ <option key="ocl-test-vectors" name="push-file" value="/data/nativetest64/unrestricted/ocl-test-vectors"/>
<option key="ocl-test-image-clcopyimage" name="push-file" value="/data/nativetest64/unrestricted/ocl-test-image-clcopyimage"/>
<option key="ocl-test-image-clfillimage" name="push-file" value="/data/nativetest64/unrestricted/ocl-test-image-clfillimage"/>
<option key="ocl-test-image-clgetinfo" name="push-file" value="/data/nativetest64/unrestricted/ocl-test-image-clgetinfo"/>
@@ -210,15 +209,8 @@
<option name="par-file-name" value="opencl_cts"/>
<option name="inject-android-serial" value="true"/>
<option name="test-timeout" value="30m"/>
- <option name="python-options" value="vec-align"/>
- <option name="python-options" value="/data/nativetest64/unrestricted/ocl-test-vec-align"/>
- </test>
- <test class="com.android.tradefed.testtype.python.PythonBinaryHostTest">
- <option name="par-file-name" value="opencl_cts"/>
- <option name="inject-android-serial" value="true"/>
- <option name="test-timeout" value="30m"/>
- <option name="python-options" value="vec-step"/>
- <option name="python-options" value="/data/nativetest64/unrestricted/ocl-test-vec-step"/>
+ <option name="python-options" value="vectors"/>
+ <option name="python-options" value="/data/nativetest64/unrestricted/ocl-test-vectors"/>
</test>
<test class="com.android.tradefed.testtype.python.PythonBinaryHostTest">
<option name="par-file-name" value="opencl_cts"/>
diff --git a/scripts/tests.json b/scripts/tests.json
index 715d308..769c1d7 100644
--- a/scripts/tests.json
+++ b/scripts/tests.json
@@ -229,7 +229,7 @@
"srcs": [
"test_conformance/spirv_new/*.cpp",
"test_conformance/math_brute_force/reference_math.cpp",
- "test_conformance/math_brute_force/Utility.cpp"
+ "test_conformance/math_brute_force/utility.cpp"
],
"data": [
"test_conformance/spirv_new/spirv_asm/*",
@@ -259,17 +259,10 @@
]
},
{
- "test_name": "vec-align",
- "binary_name": "ocl-test-vec-align",
+ "test_name": "vectors",
+ "binary_name": "ocl-test-vectors",
"srcs": [
- "test_conformance/vec_align/*.cpp"
- ]
- },
- {
- "test_name": "vec-step",
- "binary_name": "ocl-test-vec-step",
- "srcs": [
- "test_conformance/vec_step/*.cpp"
+ "test_conformance/vectors/*.cpp"
]
},
{
