Will Salmon pushed to branch willsalmon/defaultWorkspaces at BuildStream / buildstream
Commits:
-
94667be3
by William Salmon at 2018-10-25T08:30:26Z
2 changed files:
Changes:
| ... | ... | @@ -462,7 +462,8 @@ class Stream(): |
| 462 | 462 |
track_selection=PipelineSelection.REDIRECT)
|
| 463 | 463 |
|
| 464 | 464 |
for target, directory in zip(elements, directories):
|
| 465 |
- directory = os.path.abspath(directory)
|
|
| 465 |
+ if not os.path.isabs(directory):
|
|
| 466 |
+ directory = os.path.abspath(os.path.join(self._context.workspacedir, directory))
|
|
| 466 | 467 |
|
| 467 | 468 |
if not list(target.sources()):
|
| 468 | 469 |
build_depends = [x.name for x in target.dependencies(Scope.BUILD, recurse=False)]
|
| ... | ... | @@ -184,7 +184,7 @@ def test_open_multi(cli, tmpdir, datafiles): |
| 184 | 184 |
|
| 185 | 185 |
@pytest.mark.datafiles(DATA_DIR)
|
| 186 | 186 |
def test_open_multi_with_directory(cli, tmpdir, datafiles):
|
| 187 |
- workspace_object = WorkspaceCreater(cli, tmpdir, datafiles)
|
|
| 187 |
+ workspace_object = WorkspaceCreater(cli, tmpdir, datafiles)
|
|
| 188 | 188 |
|
| 189 | 189 |
results = workspace_object.create_workspace_elements(repo_kinds, False, repo_kinds)
|
| 190 | 190 |
os.makedirs(workspace_object.workspace_cmd, exist_ok=True)
|