Add missing cpu-only options to some tests

Author: kurapov-peter

omniscidb/Tests/ArrayTest.cpp

@@ -925,6 +925,7 @@ TEST_F(MultiFragArrayParallelLinearizationTest, IndexedArrayJoin) {
 }
 
 int main(int argc, char** argv) {
+  auto config = std::make_shared<Config>();
   g_is_test_env = true;
 
   TestHelpers::init_logger_stderr_only(argc, argv);
@@ -936,14 +937,18 @@ int main(int argc, char** argv) {
   logger::LogOptions log_options(argv[0]);
   log_options.max_files_ = 0;  // stderr only by default
   desc.add(log_options.get_options());
+  desc.add_options()("cpu-only",
+                     po::value<bool>(&config->exec.cpu_only)
+                         ->default_value(config->exec.cpu_only)
+                         ->implicit_value(true));
 
   po::variables_map vm;
   po::store(po::command_line_parser(argc, argv).options(desc).run(), vm);
   po::notify(vm);
 
-  init();
-  config().exec.heterogeneous.allow_cpu_retry = true;
-  config().exec.heterogeneous.allow_query_step_cpu_retry = true;
+  config->exec.heterogeneous.allow_cpu_retry = true;
+  config->exec.heterogeneous.allow_query_step_cpu_retry = true;
+  init(config);
 
   int err{0};
   try {

omniscidb/Tests/GroupByTest.cpp

@@ -364,6 +364,7 @@ TEST_F(BigCardinalityThresholdTest, EmptyFilters) {
 }
 
 int main(int argc, char** argv) {
+  auto config = std::make_shared<Config>();
   g_is_test_env = true;
 
   TestHelpers::init_logger_stderr_only(argc, argv);
@@ -375,14 +376,18 @@ int main(int argc, char** argv) {
   logger::LogOptions log_options(argv[0]);
   log_options.max_files_ = 0;  // stderr only by default
   desc.add(log_options.get_options());
+  desc.add_options()("cpu-only",
+                     po::value<bool>(&config->exec.cpu_only)
+                         ->default_value(config->exec.cpu_only)
+                         ->implicit_value(true));
 
   po::variables_map vm;
   po::store(po::command_line_parser(argc, argv).options(desc).run(), vm);
   po::notify(vm);
 
-  init();
-  config().exec.heterogeneous.allow_cpu_retry = false;
-  config().exec.heterogeneous.allow_query_step_cpu_retry = false;
+  config->exec.heterogeneous.allow_cpu_retry = false;
+  config->exec.heterogeneous.allow_query_step_cpu_retry = false;
+  init(config);
 
   int err{0};
   try {

omniscidb/Tests/NoCatalogSqlTest.cpp

@@ -111,6 +111,7 @@ class NoCatalogSqlTest : public ::testing::Test {
  protected:
   static void SetUpTestSuite() {
     config_ = std::make_shared<Config>();
+    config_->exec.cpu_only = true;
 
     schema_provider_ = std::make_shared<TestSchemaProvider>();
 
@@ -264,6 +265,7 @@ TEST_F(NoCatalogSqlTest, MultipleCalciteMultipleThreads) {
 TEST(CalciteReinitTest, SingleThread) {
   auto schema_provider = std::make_shared<TestSchemaProvider>();
   auto config = std::make_shared<Config>();
+  config->exec.cpu_only = true;
   for (int i = 0; i < 10; ++i) {
     auto calcite = CalciteMgr::get();
     auto query_ra =
@@ -275,6 +277,7 @@ TEST(CalciteReinitTest, SingleThread) {
 TEST(CalciteReinitTest, MultipleThreads) {
   auto schema_provider = std::make_shared<TestSchemaProvider>();
   auto config = std::make_shared<Config>();
+  config->exec.cpu_only = true;
   for (int i = 0; i < 10; ++i) {
     auto f = std::async(std::launch::async, [schema_provider, config]() {
       auto calcite = CalciteMgr::get();
@@ -296,6 +299,7 @@ void parse_cli_args_to_globals(int argc, char* argv[]) {
   desc.add_options()("use-groupby-buffer-desc",
                      po::bool_switch()->default_value(false),
                      "Use GroupBy Buffer Descriptor for hash tables.");
+  desc.add_options()("cpu-only", "ignored option");
 
   po::variables_map vm;
 

omniscidb/Tests/ResultSetArrowConversion.cpp

@@ -70,6 +70,10 @@ void parse_cli_args(int argc, char* argv[], ConfigPtr config) {
                      po::value<bool>(&config->rs.enable_columnar_output)
                          ->default_value(config->rs.enable_columnar_output),
                      "Enable columnar_output");
+  desc.add_options()("cpu-only",
+                     po::value<bool>(&config->exec.cpu_only)
+                         ->default_value(config->exec.cpu_only)
+                         ->implicit_value(true));
 
   logger::LogOptions log_options(argv[0]);
   log_options.severity_ = logger::Severity::FATAL;

omniscidb/Tests/StringDictionaryTest.cpp

@@ -874,6 +874,7 @@ int main(int argc, char** argv) {
           ->default_value(g_cache_string_hash)
           ->implicit_value(true),
       "Cache string hash values in the string dictionary server during import.");
+  desc.add_options()("cpu-only", "ignored option");
 
   logger::LogOptions log_options(argv[0]);
   log_options.severity_ = logger::Severity::FATAL;