Task #4452: Fixed a few more tests (again?)

.gitattributes

@@ -3710,6 +3710,7 @@ RTCP/Cobalt/GPUProc/test/cuda/tCudaRuntimeCompiler.run eol=lf
 RTCP/Cobalt/GPUProc/test/cuda/tCudaRuntimeCompiler.sh eol=lf
 RTCP/Cobalt/GPUProc/test/cuda/tDelayAndBandPass.run eol=lf
 RTCP/Cobalt/GPUProc/test/cuda/tDelayAndBandPass.sh eol=lf
+RTCP/Cobalt/GPUProc/test/cuda/tDelayAndBandPassKernel.sh eol=lf
 RTCP/Cobalt/GPUProc/test/cuda/tFIR_Filter.parset.77_Stations -text
 RTCP/Cobalt/GPUProc/test/cuda/tFIR_Filter.parset.AARTFAAC -text
 RTCP/Cobalt/GPUProc/test/cuda/tFIR_Filter.parset.small-test -text

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

@@ -22,7 +22,8 @@ lofar_add_test(tDelayAndBandPassKernel tDelayAndBandPassKernel.cc)
 
 # Trick tDelayAndBandPass into thinking that it can find the kernels it needs
 # using the LOFARROOT environment variable
-set_tests_properties(tCorrelator tDelayAndBandPass
+set_tests_properties(
+  tCorrelator tDelayAndBandPass tDelayAndBandPassKernel tFIR_Filter
   PROPERTIES ENVIRONMENT "LOFARROOT=${PACKAGE_SOURCE_DIR}")
 
 # To compile .cu files, invoke CUDA's nvcc, but respect the host C/C++ compiler (variants) selection.

RTCP/Cobalt/GPUProc/test/cuda/tDelayAndBandPassKernel.cc

@@ -41,7 +41,7 @@ int main() {
   gpu::Context ctx(device);
   gpu::Stream stream(ctx);
 
-  Parset ps("tDelayAndBandPassKernel.parset.in");
+  Parset ps("tDelayAndBandPassKernel.in_parset");
   string srcFilename("DelayAndBandPass.cu");
 
   // Get default parameters for the compiler

RTCP/Cobalt/GPUProc/test/cuda/tDelayAndBandPassKernel.sh

+#!/bin/sh
+./runctest.sh tDelayAndBandPassKernel

RTCP/Cobalt/GPUProc/test/cuda/tFIR_Filter.cc

@@ -23,11 +23,13 @@
 #include "tFIR_Filter.h"
 
 #include <iostream>
-#include <stdlib.h> 
+#include <cstdlib> 
 #include <sstream>
 #include <fstream>
+#include <string>
 #include <cuda.h>
 #include <Common/LofarLogger.h>
+#include <boost/format.hpp>
 
 using namespace LOFAR;
 using namespace LOFAR::Cobalt;
@@ -35,10 +37,12 @@ using namespace LOFAR::Cobalt;
 int main()
 {
   INIT_LOGGER("tFIR_Filter");
-  char const *kernel_name = "FIR_Filter";
-  const char *kernel_extention = ".cu";
+  const char *lofarroot = getenv("LOFARROOT");
+  std::string kernel_path = 
+    std::string(lofarroot ? lofarroot : ".") + "/share/gpu/kernels/";
+  const char *kernel_name = "FIR_Filter.cu";
   std::stringstream ss;
-  ss << "nvcc " << kernel_name << kernel_extention
+  ss << "nvcc " << kernel_path << kernel_name
     << " -ptx"
     << " -DNR_STATIONS=" << NR_STATIONS
     << " -DNR_TAPS=" << NR_TAPS