diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-07-20 17:51:29 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-07-20 17:52:37 -0400 |
| commit | 193e23b12feebe19f2e425ef72f6010b6871e1e2 (patch) | |
| tree | 27d2e7b72c14191c6846af5f5418f67e1ccae3da /src/tests/core | |
| parent | c45b86bbb4a0d663938db64e51ac5137ed01262b (diff) | |
arm_test_common: Make file static variable a member variable of the testing environment
Gets rid of file-static behavior.
Diffstat (limited to 'src/tests/core')
| -rw-r--r-- | src/tests/core/arm/arm_test_common.cpp | 2 | ||||
| -rw-r--r-- | src/tests/core/arm/arm_test_common.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/tests/core/arm/arm_test_common.cpp b/src/tests/core/arm/arm_test_common.cpp index 7f9f27e192..2af487b6a4 100644 --- a/src/tests/core/arm/arm_test_common.cpp +++ b/src/tests/core/arm/arm_test_common.cpp @@ -10,8 +10,6 @@ namespace ArmTests { -static Memory::PageTable* page_table = nullptr; - TestEnvironment::TestEnvironment(bool mutable_memory_) : mutable_memory(mutable_memory_), test_memory(std::make_shared<TestMemory>(this)) { diff --git a/src/tests/core/arm/arm_test_common.h b/src/tests/core/arm/arm_test_common.h index 368f6f6c72..7fdbda494c 100644 --- a/src/tests/core/arm/arm_test_common.h +++ b/src/tests/core/arm/arm_test_common.h @@ -11,6 +11,10 @@ #include "common/common_types.h" #include "core/memory_hook.h" +namespace Memory { +struct PageTable; +} + namespace ArmTests { struct WriteRecord { @@ -81,6 +85,7 @@ private: bool mutable_memory; std::shared_ptr<TestMemory> test_memory; std::vector<WriteRecord> write_records; + Memory::PageTable* page_table = nullptr; }; } // namespace ArmTests |