testing

Author: NeerajDwivedii

google/cloud/odbc/integration_tests/odbc_driver_tests/connection_test.cc

@@ -1617,23 +1617,16 @@ TEST(ConnectionTest, CheckTraceLogFileExist) {
 #ifdef _WIN32
   log_path = "C:\\b";
   log_file = log_path + "\\odbcdriverforbigquery_0.log";
-  auto conn_str =
-      kDefaultConnectionString + ";LogPath=" + log_path + ";LogLevel=3";
-#elif defined(__APPLE__)
-  log_path = "/tmp";
-  log_file = log_path + "/odbcdriverforbigquery_0.log";
-  auto conn_str =
-      kDefaultConnectionString + ";LogPath=" + log_path + ";LogLevel=3";
+  auto odbc_ini_path =k_trace_reg_path;
 #else
   log_path = "/tmp";
   log_file = log_path + "/odbcdriverforbigquery_0.log";
-
   auto odbc_ini = google::cloud::internal::GetEnv("GOOGLEBIGQUERYODBCINI");
   auto odbc_ini_path = odbc_ini.value_or("");
-  UpdateTraceConfig(odbc_ini_path, log_path, "3");
+  #endif /* _WIN32 */
+  
   auto const& conn_str = kDefaultConnectionString;
-#endif /* _WIN32 */
-
+  UpdateTraceConfig(odbc_ini_path, log_path, "3");
   // Remove existing file
   if (std::filesystem::exists(log_file)) {
     std::filesystem::remove(std::filesystem::path(log_file));
@@ -1661,10 +1654,8 @@ TEST(ConnectionTest, CheckTraceLogFileExist) {
       content.find("SQLFreeHandle:: DBC handle is free") != std::string::npos;
   EXPECT_TRUE(contains_text);
 
-#if defined(__linux__)
   // Disable tracing for non windows
   UpdateTraceConfig(odbc_ini_path, log_path, "0");
-#endif /* defined(__linux__) */
 }
 
 #endif  // BQ_DRIVER_INTEGRATION_TESTS

google/cloud/odbc/testing/odbc_utils/commons.h

@@ -56,6 +56,16 @@ bool const kIsWin32 = true;
 bool const kIsWin32 = false;
 #endif
 
+#ifdef _WIN64
+// 64-bit
+inline std::string k_trace_reg_path =
+    R"(SOFTWARE\\Google\\ODBC Driver for BigQuery)";
+#else
+// 32-bit
+inline std::string k_trace_reg_path =
+    R"(SOFTWARE\\WOW6432Node\\Google\\ODBC Driver for BigQuery)";
+#endif  // _WIN64
+
 bool const kIsUnixODBC =
     google::cloud::internal::GetEnv("UNIXODBC_INSTALLED").value_or("false") ==
     "true";