Skip to content
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

Jump to bottom

Add SNAPCRAFT_PROJECT_DIR environment variable. #2534

Merged
merged 3 commits into from Apr 16, 2019
Merged

Add SNAPCRAFT_PROJECT_DIR environment variable. #2534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cefd61
Add SNAPCRAFT_PROJECT_DIR environment variable.
tonysimpson Apr 15, 2019
bc1c572
Workaround for spelling mistake in libyaml
tonysimpson Apr 16, 2019
16befd2
Fix formatting
tonysimpson Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions snapcraft/internal/project_loader/_env.py
View file
Open in desktop
Expand Up @@ -110,6 +110,7 @@ def snapcraft_global_environment(project: project.Project) -> Dict[str, str]:
"SNAPCRAFT_PARALLEL_BUILD_COUNT": str(project.parallel_build_count),
"SNAPCRAFT_PROJECT_NAME": name,
"SNAPCRAFT_PROJECT_VERSION": version,
"SNAPCRAFT_PROJECT_DIR": project._project_dir,
"SNAPCRAFT_PROJECT_GRADE": grade,
"SNAPCRAFT_STAGE": project.stage_dir,
"SNAPCRAFT_PRIME": project.prime_dir,
Expand Down
8 changes: 5 additions & 3 deletions tests/unit/project/test_project_info.py
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
from tests import unit
from textwrap import dedent

from testtools.matchers import Equals, Is
from testtools.matchers import Equals, Is, MatchesRegex

from snapcraft.project._project_info import ProjectInfo
from snapcraft.project import errors
Expand Down Expand Up @@ -172,10 +172,12 @@ def test_tab_in_yaml(self):
)

self.assertThat(raised.source, Equals(snapcraft_yaml_file_path))
# libyaml had a spelling mistake indentation/intendation
self.assertThat(
raised.message,
Equals(
"found a tab character that violate intendation on line 5, column 1"
MatchesRegex(
"found a tab character that violate (indentation|intendation)"
" on line 5, column 1"
),
)

Expand Down
6 changes: 6 additions & 0 deletions tests/unit/project_loader/test_environment.py
View file
Open in desktop
Expand Up @@ -258,6 +258,7 @@ def test_config_env_dedup(self):
'SNAPCRAFT_PART_INSTALL="{}/parts/main/install"'.format(self.path),
'SNAPCRAFT_PART_SRC="{}/parts/main/src"'.format(self.path),
'SNAPCRAFT_PRIME="{}/prime"'.format(self.path),
'SNAPCRAFT_PROJECT_DIR="{}"'.format(self.path),
'SNAPCRAFT_PROJECT_GRADE="stable"',
'SNAPCRAFT_PROJECT_NAME="test"',
'SNAPCRAFT_PROJECT_VERSION="1"',
Expand Down Expand Up @@ -509,6 +510,11 @@ def test_extension_dir(self):
env = project_config.parts.build_env_for_part(part1)
self.assertThat(env, Contains('SNAPCRAFT_EXTENSIONS_DIR="/foo"'))

def test_project_dir(self):
project_config = self.make_snapcraft_project(self.snapcraft_yaml)
env = project_config.parts.build_env_for_part(project_config.parts.all_parts[0])
self.assertThat(env, Contains('SNAPCRAFT_PROJECT_DIR="{}"'.format(self.path)))

def test_build_environment(self):
self.useFixture(FakeOsRelease())

Expand Down