Commit e8c0ebdb authored by Tom Stellard's avatar Tom Stellard

opencv: Add 'individual' option to piglit.conf

This replaces the individual parameter in add_opencv_tests()
parent bfbfed32
......@@ -38,12 +38,13 @@ class OpenCVTest(GTest):
GTest.__init__(self, options)
def add_opencv_tests(profile, individual = False):
def add_opencv_tests(profile):
if not PIGLIT_CONFIG.has_option('opencv', 'opencv_test_ocl_bindir'):
return
opencv_test_ocl = path.join(PIGLIT_CONFIG.get('opencv',
'opencv_test_ocl_bindir'), 'opencv_test_ocl')
individual = PIGLIT_CONFIG.has_option('opencv', 'individual')
if not path.isfile(opencv_test_ocl):
print('Warning: {} does not exist.\nSkipping OpenCV '
'tests...'.format(opencv_test_ocl))
......
......@@ -2,6 +2,16 @@
; Set the opencv_test_ocl_bindir variable to run the OpenCV OpenCL tests.
;opencv_test_ocl_bindir=/home/user/opencv/build/bin
;opencv_workdir=/home/user/opencv/samples/c/
; Run each subtest individiually to so a result is recored for each subtest.
; For example, default behavior:
; opencv/OCL_ML/Kmeans -> Pass
;
; With 'individual' option:
; OCL_ML/Kmeans.Mat/0 -> Pass
; OCL_ML/Kmeans.Mat/1 -> Pass
; OCL_ML/Kmeans.Mat/2 -> Pass
;
;individual
;
[xts]
; Set bindir equal to the root of the xts directory
......
......@@ -28,5 +28,5 @@ from tests.cl import profile
from framework.oclconform import add_oclconform_tests
from framework.opencv import add_opencv_tests
add_opencv_tests(profile, True)
add_opencv_tests(profile)
add_oclconform_tests(profile)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment