[gegl] tests: opencl tests - migrate to new test runner

[Øyvind "pippin" Kolås <ok src gnome org>]

commit 23846090ec76e8aee445bfc92291dc143c55ed93
Author: John Marshall <jtm home gmail com>
Date:   Mon Jun 15 11:20:53 2020 +0100

    tests: opencl tests
    - migrate to new test runner

 tests/compositions/meson.build | 16 +++++++++-------
 tests/opencl/meson.build       | 36 +++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/tests/compositions/meson.build b/tests/compositions/meson.build
index 1cb5cf480..8240d3568 100644
--- a/tests/compositions/meson.build
+++ b/tests/compositions/meson.build
@@ -83,10 +83,11 @@ endif
 tests = composition_tests + composition_tests_without_opencl
 foreach _test : tests
   # without opencl
+  _test_name = _test.underscorify()
   _xml_file = files('@0@.xml'.format(_test))
   _ref_dir = meson.current_source_dir() / 'reference'
-  test(_test.underscorify(),
-    run_test,
+  test(_test_name,
+    test_runner,
     args: [
       '--test-name', _test,
       '--output-dir', meson.current_build_dir() / 'output',
@@ -95,16 +96,16 @@ foreach _test : tests
       '--gegl-exe', gegl_bin,
       '--imgcmp-exe', gegl_imgcmp,
     ],
-    env: gegl_test_env,
+    env: gegl_test_env_no_ocl,
     should_fail: composition_tests_fail.contains(_test),
     suite: 'composition',
     is_parallel: gegl_test_parallel,
   )
 
-  # with opencl - compare against newly generated images files
+  # with opencl
   if not composition_tests_without_opencl.contains(_test)
-    test('@0@ (OpenCL)'.format(_test),
-      run_test,
+    test('@0@ (OpenCL)'.format(_test_name),
+      test_runner,
       args: [
         '--test-name', _test,
         '--output-dir', meson.current_build_dir() / 'output-opencl',
@@ -115,7 +116,8 @@ foreach _test : tests
         '--with-opencl',
       ],
       env: gegl_test_env,
-      suite: 'composition', 
+      should_fail: composition_tests_fail.contains(_test),
+      suite: 'composition',
       is_parallel: gegl_test_parallel,
     )
   endif
diff --git a/tests/opencl/meson.build b/tests/opencl/meson.build
index f73648561..7c8fb04ae 100644
--- a/tests/opencl/meson.build
+++ b/tests/opencl/meson.build
@@ -1,5 +1,5 @@
 
-test_list = [
+opencl_tests = [
   'bilateral-filter',
   'box-blur',
   'brightness-contrast',
@@ -21,24 +21,22 @@ test_list = [
   'vignette',
 ]
 
-opencl_test = find_program('opencl_test.sh')
-foreach test_name: test_list
-  xml_file = meson.current_source_dir() / test_name + '.xml'
-  out_dir  = meson.current_build_dir()
-  out_name = test_name + '.png'
-
-  test(test_name,
-    opencl_test,
-    env: [
-      'ABS_BUILDDIR='+ out_dir,
-      'GEGL_BIN='+ gegl_bin.full_path(),
-      'GEGL_IMGCMP_BIN='+ gegl_imgcmp.full_path(),
-      'XML_FILE='+ xml_file,
-      'OUT_FILE='+ out_name,
-      'GEGL_SWAP=RAM',
-      'GEGL_PATH='+ meson.build_root() / 'operations',
+foreach _test : opencl_tests
+  test(_test.underscorify(),
+    test_runner,
+    args: [
+      '--test-name', _test,
+      '--output-dir', meson.current_build_dir() / 'output',
+      '--reference-path', meson.current_build_dir() / 'reference',
+      '--generate-reference',
+      '--input-file', files('@0@.xml'.format(_test)),
+      '--gegl-exe', gegl_bin,
+      '--imgcmp-exe', gegl_imgcmp,
+      '--with-opencl',
     ],
+    env: gegl_test_env,
     suite: 'opencl',
-    is_parallel: false,
-  )
+    timeout: 60,
+    is_parallel: gegl_test_parallel,
+    )
 endforeach