Skip to content

Move paths to env.conf to make it configurable #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
narasimhan-v merged 1 commit into from
Sep 18, 2025
Merged

Move paths to env.conf to make it configurable #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions avocado-setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,11 @@
AVOCADO_CONFIG_DIR = "%s/.config/avocado" % os.environ['HOME']
BASE_PATH = os.path.dirname(os.path.abspath(__file__))
CONFIG_PATH = "%s/config/wrapper/env.conf" % BASE_PATH
prescript = "%s/config/prescript" % BASE_PATH
postscript = "%s/config/postscript" % BASE_PATH
NORUNTEST_PATH = "%s/config/wrapper/no_run_tests.conf" % BASE_PATH
TEST_CONF_PATH = "%s/config/tests/" % BASE_PATH
CONFIGFILE = configparser.ConfigParser()
NORUNTEST_PATH = "%s/config/wrapper/no_run_tests.conf" % BASE_PATH
NORUNTESTFILE = configparser.ConfigParser()
INPUTFILE = configparser.ConfigParser()
INPUTFILE.optionxform = str
TEST_DIR = "%s/tests" % BASE_PATH
DATA_DIR = "%s/data" % BASE_PATH
LOG_DIR = "%s/results" % BASE_PATH
logger = logger_init(filepath=BASE_PATH).getlogger()
args = None
outputdir = ''
Expand Down Expand Up @@ -699,6 +693,12 @@ def parse_test_config(test_config_file, avocado_bin, enable_kvm):
logger.error(f"No Run Config Path: {args.NORUNTEST_PATH} not defined")
sys.exit(1)

globals() ['TEST_CONF_PATH'] = os.path.join(BASE_PATH, eval(CONFIGFILE.get('paths', 'test_cfg_dir')))
globals() ['LOG_DIR'] = os.path.join(BASE_PATH, eval(CONFIGFILE.get('paths', 'results_dir')))
globals() ['TEST_DIR'] = os.path.join(BASE_PATH, eval(CONFIGFILE.get('paths', 'test_dir')))
globals() ['DATA_DIR'] = os.path.join(BASE_PATH, eval(CONFIGFILE.get('paths', 'data_dir')))
globals() ['prescript'] = os.path.join(BASE_PATH, eval(CONFIGFILE.get('paths', 'pre_script_dir')))
globals() ['postscript'] = os.path.join(BASE_PATH, eval(CONFIGFILE.get('paths', 'post_script_dir')))
globals() ['BASE_FRAMEWORK'] = eval(CONFIGFILE.get('framework', 'base'))
globals() ['KVM_FRAMEWORK'] = eval(CONFIGFILE.get('framework', 'kvm'))
globals() ['OPTIONAL_FRAMEWORK'] = eval(CONFIGFILE.get('framework', 'optional'))
Expand Down
8 changes: 8 additions & 0 deletions config/wrapper/env.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
[paths]
test_cfg_dir = 'config/tests/'
test_dir = 'tests'
data_dir = 'data'
results_dir = 'results'
pre_script_dir = 'config/prescript'
post_script_dir = 'config/postscript'

[framework]
# Usage examples:
# (avocado-framework, '') -- Installs latest released version
Expand Down