Task #4452: Most OpenCL tests are not OpenCL-specific anymore

.gitattributes

@@ -3724,32 +3724,32 @@ RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.AARTFAAC -text
 RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.parset.small-test -text
 RTCP/Cobalt/GPUProc/test/opencl/RTCP_UnitTest.run eol=lf
 RTCP/Cobalt/GPUProc/test/opencl/tContext.run eol=lf
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.parset -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.run eol=lf
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_1sec_1st_5sb_noflagging.sh eol=lf
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB0.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB1.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB2.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB3.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.output/SB4.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.parset -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.run eol=lf
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_1st_5sb.sh eol=lf
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB0.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB1.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB2.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB3.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.output/SB4.MS -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.parset -text
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.run eol=lf
-RTCP/Cobalt/GPUProc/test/opencl/tCorrelate_3sec_2st_5sb.sh eol=lf
-RTCP/Cobalt/GPUProc/test/opencl/tGPUPerformance.run eol=lf
 RTCP/Cobalt/GPUProc/test/opencl/tPerformanceCounter.run eol=lf
+RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB0.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB1.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB2.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB3.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.output/SB4.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.parset -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.run eol=lf
+RTCP/Cobalt/GPUProc/test/tCorrelate_1sec_1st_5sb_noflagging.sh eol=lf
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB0.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB1.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB2.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB3.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.output/SB4.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.parset -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.run eol=lf
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_1st_5sb.sh eol=lf
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB0.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB1.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB2.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB3.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.output/SB4.MS -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.parset -text
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.run eol=lf
+RTCP/Cobalt/GPUProc/test/tCorrelate_3sec_2st_5sb.sh eol=lf
+RTCP/Cobalt/GPUProc/test/tGPUPerformance.run eol=lf
 RTCP/Cobalt/GPUProc/test/tStorageProcesses.sh eol=lf
 RTCP/Cobalt/InputProc/test/tBlockReader.in_16bit -text
 RTCP/Cobalt/InputProc/test/tBlockReader.in_8bit -text

RTCP/Cobalt/GPUProc/test/CMakeLists.txt

@@ -13,6 +13,16 @@ lofar_add_test(tSSH tSSH.cc)
 lofar_add_executable(DummyStorage DummyStorage.cc)
 lofar_add_test(tStorageProcesses tStorageProcesses.cc DEPENDS DummyStorage)
 
+if(UNITTEST++_FOUND)
+  lofar_add_test(tCorrelatorWorkQueue tCorrelatorWorkQueue.cc)
+endif()
+
+# tests that use testParset.sh
+lofar_add_test(tCorrelate_1sec_1st_5sb_noflagging DEPENDS rtcp)
+lofar_add_test(tCorrelate_3sec_1st_5sb DEPENDS rtcp)
+lofar_add_test(tCorrelate_3sec_2st_5sb DEPENDS rtcp)
+#lofar_add_test(tGPUPerformance DEPENDS rtcp) # performance measurement and comparison are broken
+
 if(USE_CUDA)
   add_subdirectory(cuda)
 endif()

RTCP/Cobalt/GPUProc/test/opencl/CMakeLists.txt

@@ -2,19 +2,6 @@
 
 include(LofarCTest)
 
-# TODO: move generic tests to ../ when supported by our CUDA port
-
 lofar_add_test(tContext tContext.cc)
 lofar_add_test(tPerformanceCounter tPerformanceCounter.cc)
 #lofar_add_test(RTCP_UnitTest RTCP_UnitTest.cc UnitTest.cc)
-
-lofar_find_package(UnitTest++)
-if(UNITTEST++_FOUND)
-  lofar_add_test(tCorrelatorWorkQueue tCorrelatorWorkQueue.cc)
-endif()
-
-# tests that use testParset.sh
-lofar_add_test(tCorrelate_1sec_1st_5sb_noflagging DEPENDS rtcp_opencl)
-lofar_add_test(tCorrelate_3sec_1st_5sb DEPENDS rtcp_opencl)
-lofar_add_test(tCorrelate_3sec_2st_5sb DEPENDS rtcp_opencl)
-lofar_add_test(tGPUPerformance DEPENDS rtcp_opencl)