diff --git a/core/test_run.py b/core/test_run.py index ae0762e..c7d01ce 100644 --- a/core/test_run.py +++ b/core/test_run.py @@ -22,6 +22,7 @@ class TestRun: plugin_manager = None duts = None disks = None + TEST_RUN_DATA_PATH = None @classmethod @contextmanager diff --git a/core/test_run_utils.py b/core/test_run_utils.py index 0f5326e..cb971b1 100644 --- a/core/test_run_utils.py +++ b/core/test_run_utils.py @@ -23,6 +23,7 @@ from test_tools import disk_finder from test_utils.dut import Dut TestRun = core.test_run.TestRun +TestRun.TEST_RUN_DATA_PATH = "/tmp/test_data" @classmethod diff --git a/log/logger.py b/log/logger.py index bb8a988..233aae4 100644 --- a/log/logger.py +++ b/log/logger.py @@ -5,6 +5,7 @@ import logging import os +import posixpath import sys from contextlib import contextmanager from datetime import datetime @@ -193,7 +194,7 @@ class Log(HtmlLogManager, metaclass=Singleton): if not check_if_file_exists(messages_log): messages_log = "/var/log/syslog" log_files = {"messages.log": messages_log, - "dmesg.log": "/tmp/dmesg"} + "dmesg.log": posixpath.join(TestRun.TEST_RUN_DATA_PATH, "dmesg")} extra_logs = TestRun.config.get("extra_logs", {}) log_files.update(extra_logs) diff --git a/test_tools/peach_fuzzer/peach_fuzzer.py b/test_tools/peach_fuzzer/peach_fuzzer.py index c3aec23..116e3b7 100644 --- a/test_tools/peach_fuzzer/peach_fuzzer.py +++ b/test_tools/peach_fuzzer/peach_fuzzer.py @@ -27,7 +27,7 @@ class PeachFuzzer: peach_fuzzer_3_0_url = "https://sourceforge.net/projects/peachfuzz/files/Peach/3.0/" \ "peach-3.0.202-linux-x86_64-release.zip" - base_dir = "/root/Fuzzy" + base_dir = posixpath.join(TestRun.TEST_RUN_DATA_PATH, "Fuzzy") peach_dir = "peach-3.0.202-linux-x86_64-release" xml_config_template = os.path.join(os.path.dirname(__file__), "config_template.xml") xml_config_file = posixpath.join(base_dir, "fuzzerConfig.xml")