Skip to content

Commit

Permalink
use the new variable for the repo dir everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
bedroge committed Mar 8, 2024
1 parent ca7a8c1 commit 941ce7e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions test/compat_layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ def __init__(self):
self.valid_prog_environs = ['*']
if self.eessi_version == 'latest':
# resolve the "latest" symlink to the actual version
self.eessi_version = os.readlink(os.path.join(EESSI_REPO_DIR, 'latest'))
self.eessi_version = os.readlink(os.path.join(eessi_repo_dir, 'latest'))
# 2021.06 did not have the 'versions' subdirectory yet
if self.eessi_version == '2021.06':
self.eessi_repo_dir = EESSI_REPO_DIR
self.eessi_repo_dir = eessi_repo_dir
else:
self.eessi_repo_dir = os.path.join(EESSI_REPO_DIR, 'versions')
self.eessi_repo_dir = os.path.join(eessi_repo_dir, 'versions')

self.compat_dir = os.path.join(
self.eessi_repo_dir,
Expand Down Expand Up @@ -198,7 +198,7 @@ def __init__(self):
sn.assert_found(f'\n/{self.symlink_to_host}\n', self.stdout),
])


@rfm.simple_test
class GentooOverlayGitTest(RunInGentooPrefixTest):
def __init__(self):
Expand All @@ -217,7 +217,7 @@ def __init__(self):

self.sanity_patterns = sn.assert_found(gentoo_git_repo_info, self.stdout)


@rfm.simple_test
class GlibcEnvFileTest(RunInGentooPrefixTest):
def __init__(self):
Expand All @@ -229,7 +229,7 @@ def __init__(self):
self.command = 'equery has --package glibc EXTRA_EMAKE'

trusted_dir = os.path.join(
EESSI_REPO_DIR,
eessi_repo_dir,
'host_injections',
self.eessi_version,
'compat',
Expand Down

0 comments on commit 941ce7e

Please sign in to comment.