Merge branch 'master'

Author: jpbarrett

source/cpp_src/DiFXInterface/applications/difx2hops.cc

@@ -84,14 +84,15 @@ int main(int argc, char** argv)
     app.add_option("-b,--band", freq_bands,
                    "set frequency band codes, must pass triplet as -b <code> <freq_low> <freq_high> (in MHz) if none specified "
                    "and '-L' flag not passed, no band assignment will be made");
+    app.add_flag("-l,--localdir", difxio_localdir, "enable difxio --localdir option (search for .input files in local directory)");
     app.add_flag("-L,--legacy-bands", use_legacy_bands, legacy_freq_bands_help.c_str())->excludes("-b");
     app.add_flag("-C,--legacy-station-codes", use_legacy_stcodes,
                  "use the legacy station code map with assigning mk4 station IDs.");
     app.add_flag("-k,--mark4", export_as_mark4, "export data in the legacy mark4 format instead of hops format.");
     app.add_option("-g,--freq-groups", freq_groups, "include data only from the specified frequency groups")->delimiter(',');
     app.add_option("-w,--bandwidth", bandwidth, "include data only channels matching this bandwidth (in MHz)");
     app.add_flag("-a,--attach-difx-input", attach_difx_input, "attach the DiFX .input data to the visibility object tags");
-    app.add_flag("-d,--localdir", difxio_localdir, "enable difxio --localdir option (search for .input files in local directory)");
+
 
     CLI11_PARSE(app, argc, argv);
 

test_data/CMakeLists.txt

@@ -24,12 +24,10 @@ if(BASH_PROGRAM)
 
     set(DATA_TARBALL2 ${CMAKE_CURRENT_BINARY_DIR}/3764.tar.gz)
 
-    if (DEFINED ENV{HOPS_CICD_KEY})
-        add_test(NAME TESTDATA2_COPY
-          COMMAND cp ${HOPS_CACHED_TEST_DATADIR}/3764.tar.gz ${DATA_TARBALL2}
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        )
-    endif()
+    add_test(NAME TESTDATA2_COPY
+      COMMAND cp ${HOPS_CACHED_TEST_DATADIR}/3764.tar.gz ${DATA_TARBALL2}
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
 
     set(DATA_TARBALL3 ${CMAKE_CURRENT_BINARY_DIR}/3593.tar.gz)
 
@@ -47,12 +45,10 @@ if(BASH_PROGRAM)
 
     set(DATA_TARBALL5 ${CMAKE_CURRENT_BINARY_DIR}/3768.tar.gz)
 
-    if (DEFINED ENV{HOPS_CICD_KEY})
-        add_test(NAME TESTDATA5_COPY
-          COMMAND cp ${HOPS_CACHED_TEST_DATADIR}/3768.tar.gz ${DATA_TARBALL5}
-          WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        )
-    endif()
+    add_test(NAME TESTDATA5_COPY
+      COMMAND cp ${HOPS_CACHED_TEST_DATADIR}/3768.tar.gz ${DATA_TARBALL5}
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
 
     set(DIFX_DATA_TARBALL ${CMAKE_CURRENT_BINARY_DIR}/vt9105.tar.gz)
 
@@ -73,14 +69,12 @@ if(BASH_PROGRAM)
     )
     set_tests_properties(TESTDATA_AE_UNPACK PROPERTIES DEPENDS TESTDATA_AE_COPY)
 
-    if (DEFINED ENV{HOPS_CICD_KEY})
-        add_test(NAME TESTDATA2_UNPACK
-            COMMAND ${TAR_PROGRAM} -xzf ${DATA_TARBALL2}
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        )
-        set_tests_properties(TESTDATA2_UNPACK PROPERTIES DEPENDS TESTDATA2_COPY)
-    endif()
-    
+    add_test(NAME TESTDATA2_UNPACK
+        COMMAND ${TAR_PROGRAM} -xzf ${DATA_TARBALL2}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+    set_tests_properties(TESTDATA2_UNPACK PROPERTIES DEPENDS TESTDATA2_COPY)
+
     add_test(NAME TESTDATA3_UNPACK
         COMMAND ${TAR_PROGRAM} -xzf ${DATA_TARBALL3}
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -93,13 +87,11 @@ if(BASH_PROGRAM)
     )
     set_tests_properties(TESTDATA4_UNPACK PROPERTIES DEPENDS TESTDATA4_COPY)
 
-    if (DEFINED ENV{HOPS_CICD_KEY})
-        add_test(NAME TESTDATA5_UNPACK
-            COMMAND ${TAR_PROGRAM} -xzf ${DATA_TARBALL5}
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        )
-        set_tests_properties(TESTDATA5_UNPACK PROPERTIES DEPENDS TESTDATA5_COPY)
-    endif()
+    add_test(NAME TESTDATA5_UNPACK
+        COMMAND ${TAR_PROGRAM} -xzf ${DATA_TARBALL5}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+    set_tests_properties(TESTDATA5_UNPACK PROPERTIES DEPENDS TESTDATA5_COPY)
 
     add_test(NAME DIFX_TESTDATA_UNPACK
         COMMAND ${TAR_PROGRAM} -xzf ${DIFX_DATA_TARBALL}