diff --git a/.gitattributes b/.gitattributes index a23636578fab28a74e15a4c9ecbdf5f970c4b70b..84533abf6c18c0b098dc8b3bc06f6345c2fc48b7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4621,17 +4621,17 @@ SubSystems/Online_Cobalt/test/Correlator/tCorrelate_3sec_2st_5sb.output/SB4.cflo SubSystems/Online_Cobalt/test/Correlator/tCorrelate_3sec_2st_5sb.parset -text SubSystems/Online_Cobalt/test/Correlator/tCorrelate_3sec_2st_5sb.run eol=lf SubSystems/Online_Cobalt/test/Correlator/tCorrelate_3sec_2st_5sb.sh eol=lf -SubSystems/Online_Cobalt/test/tMACfeedback.in_parset_failure_1 -text -SubSystems/Online_Cobalt/test/tMACfeedback.in_parset_success_1 -text -SubSystems/Online_Cobalt/test/tMACfeedback.run eol=lf -SubSystems/Online_Cobalt/test/tMACfeedback.run2.in eol=lf -SubSystems/Online_Cobalt/test/tMACfeedback.sh eol=lf SubSystems/Online_Cobalt/test/tProductionParsets.in_parsets/CorrProc_173014.param -text SubSystems/Online_Cobalt/test/tProductionParsets.in_parsets/CorrProc_196344-CygAf009-225SAPS.cleaned.param -text SubSystems/Online_Cobalt/test/tProductionParsets.run eol=lf SubSystems/Online_Cobalt/test/tProductionParsets.sh eol=lf SubSystems/Online_Cobalt/test/tRTmetadataToFile.run eol=lf SubSystems/Online_Cobalt/test/tRTmetadataToFile.sh eol=lf +SubSystems/Online_Cobalt/test/tStatusFeedback.in_parset_failure_1 -text +SubSystems/Online_Cobalt/test/tStatusFeedback.in_parset_success_1 -text +SubSystems/Online_Cobalt/test/tStatusFeedback.run eol=lf +SubSystems/Online_Cobalt/test/tStatusFeedback.run2.in eol=lf +SubSystems/Online_Cobalt/test/tStatusFeedback.sh eol=lf SubSystems/Online_Cobalt/test/tgenerateStationStreams.run eol=lf SubSystems/Online_Cobalt/test/tgenerateStationStreams.sh eol=lf SubSystems/Online_Cobalt/test/tstartBGL.in_parset -text diff --git a/SubSystems/Online_Cobalt/test/CMakeLists.txt b/SubSystems/Online_Cobalt/test/CMakeLists.txt index 46058d676cdfe70dabbb7e38a38e22e2e49bbafd..9682fe742845f10afcbcea8ac4c0b8c8964a7754 100644 --- a/SubSystems/Online_Cobalt/test/CMakeLists.txt +++ b/SubSystems/Online_Cobalt/test/CMakeLists.txt @@ -2,7 +2,7 @@ include(LofarCTest) -foreach(_file testFuncs.sh runtest.sh tMACfeedback.run2) +foreach(_file testFuncs.sh runtest.sh tStatusFeedback.run2) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/${_file}.in ${CMAKE_CURRENT_BINARY_DIR}/${_file} @ONLY) @@ -10,7 +10,7 @@ endforeach() set(_tests tgenerateStationStreams - tMACfeedback + tStatusFeedback tProductionParsets tstartBGL ) diff --git a/SubSystems/Online_Cobalt/test/tMACfeedback.run b/SubSystems/Online_Cobalt/test/tMACfeedback.run deleted file mode 100755 index 7727306af7f98b7228a527cae02e8a10bdcda76f..0000000000000000000000000000000000000000 --- a/SubSystems/Online_Cobalt/test/tMACfeedback.run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./tMACfeedback.run2 diff --git a/SubSystems/Online_Cobalt/test/tMACfeedback.sh b/SubSystems/Online_Cobalt/test/tMACfeedback.sh deleted file mode 100755 index 5ea49e61cbf0971b5b46ce0445e5c77bcb98576e..0000000000000000000000000000000000000000 --- a/SubSystems/Online_Cobalt/test/tMACfeedback.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./runctest.sh tMACfeedback diff --git a/SubSystems/Online_Cobalt/test/tMACfeedback.in_parset_failure_1 b/SubSystems/Online_Cobalt/test/tStatusFeedback.in_parset_failure_1 similarity index 100% rename from SubSystems/Online_Cobalt/test/tMACfeedback.in_parset_failure_1 rename to SubSystems/Online_Cobalt/test/tStatusFeedback.in_parset_failure_1 diff --git a/SubSystems/Online_Cobalt/test/tMACfeedback.in_parset_success_1 b/SubSystems/Online_Cobalt/test/tStatusFeedback.in_parset_success_1 similarity index 100% rename from SubSystems/Online_Cobalt/test/tMACfeedback.in_parset_success_1 rename to SubSystems/Online_Cobalt/test/tStatusFeedback.in_parset_success_1 diff --git a/SubSystems/Online_Cobalt/test/tStatusFeedback.run b/SubSystems/Online_Cobalt/test/tStatusFeedback.run new file mode 100755 index 0000000000000000000000000000000000000000..a2dbabeefb09e4705a2861fb66940405d0f2fdee --- /dev/null +++ b/SubSystems/Online_Cobalt/test/tStatusFeedback.run @@ -0,0 +1,2 @@ +#!/bin/sh +./tStatusFeedback.run2 diff --git a/SubSystems/Online_Cobalt/test/tMACfeedback.run2.in b/SubSystems/Online_Cobalt/test/tStatusFeedback.run2.in similarity index 84% rename from SubSystems/Online_Cobalt/test/tMACfeedback.run2.in rename to SubSystems/Online_Cobalt/test/tStatusFeedback.run2.in index d268671a353beb245db82082e408a7ace5e38383..bca4e8a3a97275c552407909b5c9c5ea9dce8ea5 100755 --- a/SubSystems/Online_Cobalt/test/tMACfeedback.run2.in +++ b/SubSystems/Online_Cobalt/test/tStatusFeedback.run2.in @@ -28,8 +28,8 @@ function test_parset { # <TODO> } -test_parset $PWD/tMACfeedback.in_parset_success_1 0 "" -test_parset $PWD/tMACfeedback.in_parset_failure_1 1 "-o Cobalt.Nodes=[unreachable]" +test_parset $PWD/tStatusFeedback.in_parset_success_1 0 "" +test_parset $PWD/tStatusFeedback.in_parset_failure_1 1 "-o Cobalt.Nodes=[unreachable]" # Everything went ok exit 0 diff --git a/SubSystems/Online_Cobalt/test/tStatusFeedback.sh b/SubSystems/Online_Cobalt/test/tStatusFeedback.sh new file mode 100755 index 0000000000000000000000000000000000000000..6c8d582909b8210b477eaf031e19a21b31797b9e --- /dev/null +++ b/SubSystems/Online_Cobalt/test/tStatusFeedback.sh @@ -0,0 +1,2 @@ +#!/bin/sh +./runctest.sh tStatusFeedback