add method for resetting the global state

Summary: Will only be used for testing. There is currently an issue when running the test sequentially under the same process - the static states are shared. Reviewed By: NTillmann Differential Revision: D26635120 fbshipit-source-id: 767d1f93bc8cbb3e99c809e11bb639d7e6b6dd55
wsanville · Feb 26, 2021 · e7b0ff4 · e7b0ff4
1 parent 1e042ad
commit e7b0ff4
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 3 deletions.
diff --git a/libredex/ABExperimentContext.cpp b/libredex/ABExperimentContext.cpp
@@ -25,6 +25,10 @@ void ABExperimentContext::parse_experiments_states(
   ABExperimentContextImpl::parse_experiments_states(states);
 }
 
+void ABExperimentContext::reset_global_state() {
+  ABExperimentContextImpl::reset_global_state();
+}
+
 void ABExperimentContext::force_test_mode() {
   ABExperimentContextImpl::set_global_mode(ABGlobalMode::TEST);
 }

diff --git a/libredex/ABExperimentContext.h b/libredex/ABExperimentContext.h
@@ -81,5 +81,8 @@ class ABExperimentContext {
    * exists.
    */
   static void force_control_mode();
+
+ private:
+  static void reset_global_state();
 };
 } // namespace ab_test
diff --git a/libredex/ABExperimentContextImpl.cpp b/libredex/ABExperimentContextImpl.cpp
@@ -107,3 +107,8 @@ void ABExperimentContextImpl::setup_context() {
   m_cloned_cfg = std::make_unique<cfg::ControlFlowGraph>();
   m_cfg->deep_copy(m_cloned_cfg.get());
 }
+
+void ABExperimentContextImpl::reset_global_state() {
+  s_experiments_states.clear();
+  INST_CNT = 0;
+}
diff --git a/libredex/ABExperimentContextImpl.h b/libredex/ABExperimentContextImpl.h
@@ -41,8 +41,9 @@ class ABExperimentContextImpl : public ABExperimentContext {
 
   bool use_test();
   void setup_context();
+  static void reset_global_state();
 
   friend class ABExperimentContext;
-  friend class ABExperimentContextTest;
+  friend struct ABExperimentContextTest;
 };
 } // namespace ab_test
diff --git a/test/common/RedexTest.h b/test/common/RedexTest.h
@@ -31,6 +31,10 @@ struct RedexTest : public testing::Test {
 
   ~RedexTest() { delete g_redex; }
 
+  void reset_ab_experiments_global_state() {
+    ab_test::ABExperimentContext::reset_global_state();
+  }
+
   static void force_experiments_control_mode() {
     ab_test::ABExperimentContext::force_control_mode();
   }

diff --git a/test/integ/ABExperimentContextTest.cpp b/test/integ/ABExperimentContextTest.cpp
@@ -14,11 +14,12 @@
 
 namespace ab_test {
 
-class ABExperimentContextTest : public RedexIntegrationTest {
- protected:
+struct ABExperimentContextTest : public RedexIntegrationTest {
   static void set_global_mode(ABGlobalMode mode) {
     ABExperimentContextImpl::set_global_mode(mode);
   }
+
+  void SetUp() override { reset_ab_experiments_global_state(); }
 };
 
 void change_called_method(DexMethod* m,

diff --git a/test/integ/InstructionSequenceOutlinerTest.cpp b/test/integ/InstructionSequenceOutlinerTest.cpp
@@ -60,6 +60,8 @@ class InstructionSequenceOutlinerTest : public RedexIntegrationTest {
     RedexIntegrationTest::run_passes(passes, nullptr, m_cfg);
   }
 
+  void SetUp() override { reset_ab_experiments_global_state(); }
+
  private:
   Json::Value m_cfg;
 };