Hack around TLS destructors firing after the process exits round 2

runtime/bin/run_vm_tests.cc

Index: runtime/bin/run_vm_tests.cc
diff --git a/runtime/bin/run_vm_tests.cc b/runtime/bin/run_vm_tests.cc
index 8447a04c8307976d91724f7dc2bf8ee6473e3ef0..67fe757fb921ab1939acc16daf33b9d0e81260d9 100644
--- a/runtime/bin/run_vm_tests.cc
+++ b/runtime/bin/run_vm_tests.cc
@@ -5,16 +5,20 @@
 #include <stdio.h>
 
 #include "bin/file.h"
+#include "bin/dartutils.h"
+#include "bin/platform.h"
 
 #include "vm/benchmark_test.h"
 #include "vm/dart.h"
-#include "bin/dartutils.h"
 #include "vm/unit_test.h"
 
 
 // TODO(iposva, asiva): This is a placeholder for the real unittest framework.
 namespace dart {
 
+// Defined in vm/os_thread_win.cc
+extern bool private_flag_windows_run_tls_destructors;
+
 // vm_isolate_snapshot_buffer points to a snapshot for the vm isolate if we
 // link in a snapshot otherwise it is initialized to NULL.
 extern const uint8_t* bin::vm_isolate_snapshot_buffer;
@@ -121,6 +125,9 @@ static int Main(int argc, const char** argv) {
     ASSERT(err_msg == NULL);
   }
 
+  // TODO(zra): Remove once VM shuts down cleanly.
+  private_flag_windows_run_tls_destructors = false;

[zra, 2015/11/04 15:04:44]

Oh, I guess this needs an #if defined(TARGET_OS_WIN) around it.

+
   // Print a warning message if no tests or benchmarks were matched.
   if (run_matches == 0) {
     fprintf(stderr, "No tests matched: %s\n", run_filter);