[trafficserver] branch 9.0.x updated: ASAN: Fixed one definition rule violation

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 79bc00a  ASAN: Fixed one definition rule violation
79bc00a is described below

commit 79bc00a264244d6e504db5f866383e03c1f23072
Author: Bryan Call <bc...@apache.org>
AuthorDate: Mon May 11 15:28:14 2020 -0700

    ASAN: Fixed one definition rule violation
    
    (cherry picked from commit effb9842d67dcf0ca1c7a53f4ac7abda88c2807c)
---
 lib/records/unit_tests/unit_test_main.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/records/unit_tests/unit_test_main.cc b/lib/records/unit_tests/unit_test_main.cc
index bfa4a61..45f9d08 100644
--- a/lib/records/unit_tests/unit_test_main.cc
+++ b/lib/records/unit_tests/unit_test_main.cc
@@ -27,12 +27,14 @@
 #define CATCH_CONFIG_RUNNER
 #include "catch.hpp"
 
-Diags *diags = new CatchDiags;
 extern void ts_session_protocol_well_known_name_indices_init();
 
 int
 main(int argc, char *argv[])
 {
+  // Set the global diags variable
+  diags = new CatchDiags;
+
   // Global data initialization needed for the unit tests.
   ts_session_protocol_well_known_name_indices_init();
   // Cheat for ts_host_res_global_init as there's no records.config to check for non-default.