Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • willsalmon/buildstream
  • CumHoleZH/buildstream
  • tchaik/buildstream
  • DCotyPortfolio/buildstream
  • jesusoctavioas/buildstream
  • patrickmmartin/buildstream
  • franred/buildstream
  • tintou/buildstream
  • alatiera/buildstream
  • martinblanchard/buildstream
  • neverdie22042524/buildstream
  • Mattlk13/buildstream
  • PServers/buildstream
  • phamnghia610909/buildstream
  • chiaratolentino/buildstream
  • eysz7-x-x/buildstream
  • kerrick1/buildstream
  • matthew-yates/buildstream
  • twofeathers/buildstream
  • mhadjimichael/buildstream
  • pointswaves/buildstream
  • Mr.JackWilson/buildstream
  • Tw3akG33k/buildstream
  • AlexFazakas/buildstream
  • eruidfkiy/buildstream
  • clamotion2/buildstream
  • nanonyme/buildstream
  • wickyjaaa/buildstream
  • nmanchev/buildstream
  • bojorquez.ja/buildstream
  • mostynb/buildstream
  • highpit74/buildstream
  • Demo112/buildstream
  • ba2014sheer/buildstream
  • tonimadrino/buildstream
  • usuario2o/buildstream
  • Angelika123456/buildstream
  • neo355/buildstream
  • corentin-ferlay/buildstream
  • coldtom/buildstream
  • wifitvbox81/buildstream
  • 358253885/buildstream
  • seanborg/buildstream
  • SotK/buildstream
  • DouglasWinship/buildstream
  • karansthr97/buildstream
  • louib/buildstream
  • bwh-ct/buildstream
  • robjh/buildstream
  • we88c0de/buildstream
  • zhengxian5555/buildstream
51 results
Show changes
Commits on Source (3)
Hide whitespace changes
Inline Side-by-side
Showing
with 179 additions and 107 deletions
NEWS
View file @ 2c90cabb
......@@ -2,6 +2,19 @@
buildstream 1.3.1
=================
o BREAKING CHANGE: Moved `checkout` to the artifact subcommands. `bst checkout` is
now obsolete.
The command is now `bst artifact checkout`. `bst checkout` has been deprecated.
This implements the features of `bst checkout`, although the mandatory LOCATION
argument should now be specified with the `--directory` option.
`artifact checkout` can handle both element names and artifact refs, of which it
can take multiple.
`--deps`, `--tar` and `--integrate` options are only supported when passed a
single ELEMENT target.
o Added `bst artifact log` subcommand for viewing build logs.
o BREAKING CHANGE: The bst source-bundle command has been removed. The
......
buildstream/_frontend/cli.py
View file @ 2c90cabb
......@@ -607,67 +607,6 @@ def shell(app, element, sysroot, mount, isolate, build_, cli_buildtree, command)
sys.exit(exitcode)
##################################################################
# Checkout Command #
##################################################################
@cli.command(short_help="Checkout a built artifact")
@click.option('--force', '-f', default=False, is_flag=True,
help="Allow files to be overwritten")
@click.option('--deps', '-d', default='run',
type=click.Choice(['run', 'build', 'none']),
help='The dependencies to checkout (default: run)')
@click.option('--integrate/--no-integrate', default=True, is_flag=True,
help="Whether to run integration commands")
@click.option('--hardlinks', default=False, is_flag=True,
help="Checkout hardlinks instead of copies (handle with care)")
@click.option('--tar', default=False, is_flag=True,
help="Create a tarball from the artifact contents instead "
"of a file tree. If LOCATION is '-', the tarball "
"will be dumped to the standard output.")
@click.argument('element', required=False,
type=click.Path(readable=False))
@click.argument('location', type=click.Path(), required=False)
@click.pass_obj
def checkout(app, element, location, force, deps, integrate, hardlinks, tar):
"""Checkout a built artifact to the specified location
"""
from ..element import Scope
if not element and not location:
click.echo("ERROR: LOCATION is not specified", err=True)
sys.exit(-1)
if element and not location:
# Nasty hack to get around click's optional args
location = element
element = None
if hardlinks and tar:
click.echo("ERROR: options --hardlinks and --tar conflict", err=True)
sys.exit(-1)
if deps == "run":
scope = Scope.RUN
elif deps == "build":
scope = Scope.BUILD
elif deps == "none":
scope = Scope.NONE
with app.initialized():
if not element:
element = app.context.guess_element()
if not element:
raise AppError('Missing argument "ELEMENT".')
app.stream.checkout(element,
location=location,
force=force,
scope=scope,
integrate=integrate,
hardlinks=hardlinks,
tar=tar)
##################################################################
# Source Command #
##################################################################
......@@ -1086,6 +1025,87 @@ def artifact_log(app, artifacts):
click.echo_via_pager(data)
#####################################################################
# Artifact Checkout Command #
#####################################################################
@artifact.command(name='checkout', short_help="Checkout contents of an artifact")
@click.option('--force', '-f', default=False, is_flag=True,
help="Allow files to be overwritten")
@click.option('--deps', '-d', default=None,
type=click.Choice(['run', 'build', 'none']),
help='The dependencies to checkout (default: run)')
@click.option('--integrate/--no-integrate', default=None, is_flag=True,
help="Whether to run integration commands")
@click.option('--hardlinks', default=False, is_flag=True,
help="Checkout hardlinks instead of copying if possible")
@click.option('--tar', default=None, metavar='LOCATION',
type=click.Path(),
help="Create a tarball from the artifact contents instead "
"of a file tree. If LOCATION is '-', the tarball "
"will be dumped to the standard output.")
@click.option('--directory', default=None,
type=click.Path(file_okay=False),
help="The directory to write the tarball to")
@click.argument('artifacts', type=click.Path(), nargs=-1)
@click.pass_obj
def artifact_checkout(app, force, deps, integrate, hardlinks, tar, directory, artifacts):
"""Checkout contents of an artifact"""
from ..element import Scope
if hardlinks and tar is not None:
click.echo("ERROR: options --hardlinks and --tar conflict", err=True)
sys.exit(-1)
if tar is None and directory is None:
click.echo("ERROR: One of --directory or --tar must be provided", err=True)
sys.exit(-1)
if tar is not None and directory is not None:
click.echo("ERROR: options --directory and --tar conflict", err=True)
sys.exit(-1)
if tar is not None:
location = tar
tar = True
else:
location = os.getcwd() if directory is None else directory
tar = False
with app.initialized():
cache = app.context.artifactcache
elements, artifacts = _classify_artifacts(artifacts, cache.cas,
app.project.directory)
if not elements and not artifacts:
element = app.context.guess_element()
if element is not None:
elements = [element]
if (artifacts or len(elements) > 1) and (integrate is not None or deps is not None or tar):
raise AppError("--integrate, --deps and --tar may not be used with artifact refs or multiple elements")
if elements and not artifacts and len(elements) == 1:
if deps == "build":
scope = Scope.BUILD
elif deps == "none":
scope = Scope.NONE
else:
scope = Scope.RUN
app.stream.checkout(elements[0],
location=location,
force=force,
scope=scope,
integrate=True if integrate is None else integrate,
hardlinks=hardlinks,
tar=tar)
return
for vdir in _load_vdirs(app, elements, artifacts):
vdir = vdir.descend(["files"])
vdir.export_files(directory, can_link=hardlinks, can_destroy=force)
##################################################################
# DEPRECATED Commands #
##################################################################
......@@ -1135,3 +1155,30 @@ def fetch(app, elements, deps, track_, except_, track_cross_junctions):
def track(app, elements, deps, except_, cross_junctions):
click.echo("This command is now obsolete. Use `bst source track` instead.", err=True)
sys.exit(1)
##################################################################
# Checkout Command #
##################################################################
@cli.command(short_help="Checkout a built artifact", hidden=True)
@click.option('--force', '-f', default=False, is_flag=True,
help="Allow files to be overwritten")
@click.option('--deps', '-d', default='run',
type=click.Choice(['run', 'build', 'none']),
help='The dependencies to checkout (default: run)')
@click.option('--integrate/--no-integrate', default=True, is_flag=True,
help="Whether to run integration commands")
@click.option('--hardlinks', default=False, is_flag=True,
help="Checkout hardlinks instead of copies (handle with care)")
@click.option('--tar', default=False, is_flag=True,
help="Create a tarball from the artifact contents instead "
"of a file tree. If LOCATION is '-', the tarball "
"will be dumped to the standard output.")
@click.argument('element', required=False,
type=click.Path(readable=False))
@click.argument('location', type=click.Path(), required=False)
@click.pass_obj
def checkout(app, element, location, force, deps, integrate, hardlinks, tar):
click.echo("This command is now obsolete. Use `bst artifact checkout` instead " +
"and use the --directory option to specify LOCATION", err=True)
sys.exit(1)
contrib/bst-docker-import
View file @ 2c90cabb
......@@ -90,7 +90,7 @@ element="$1"
checkout_tar="bst-checkout-$(basename "$element")-$RANDOM.tar"
echo "INFO: Checking out $element ..." >&2
$bst_cmd checkout --tar "$element" "$checkout_tar" || die "Failed to checkout $element"
$bst_cmd artifact checkout "$element" --tar "$checkout_tar" || die "Failed to checkout $element"
echo "INFO: Successfully checked out $element" >&2
echo "INFO: Importing Docker image ..." >&2
......
tests/artifactcache/expiry.py
View file @ 2c90cabb
......@@ -132,7 +132,7 @@ def test_expiry_order(cli, datafiles, tmpdir):
wait_for_cache_granularity()
# Now extract dep.bst
res = cli.run(project=project, args=['checkout', 'dep.bst', checkout])
res = cli.run(project=project, args=['artifact', 'checkout', 'dep.bst', '--directory', checkout])
res.assert_success()
# Finally, build something that will cause the cache to overflow
......@@ -379,7 +379,8 @@ def test_extract_expiry(cli, datafiles, tmpdir):
assert cli.get_element_state(project, 'target.bst') == 'cached'
# Force creating extract
res = cli.run(project=project, args=['checkout', 'target.bst', os.path.join(str(tmpdir), 'checkout')])
res = cli.run(project=project, args=['artifact', 'checkout', 'target.bst',
'--directory', os.path.join(str(tmpdir), 'checkout')])
res.assert_success()
extractdir = os.path.join(project, 'cache', 'artifacts', 'extract', 'test', 'target')
......
tests/completions/completions.py
View file @ 2c90cabb
......@@ -8,7 +8,6 @@ DATA_DIR = os.path.dirname(os.path.realpath(__file__))
MAIN_COMMANDS = [
'artifact ',
'build ',
'checkout ',
'help ',
'init ',
'pull ',
......@@ -48,6 +47,11 @@ MAIN_OPTIONS = [
"--version ",
]
ARTIFACT_COMMANDS = [
'checkout ',
'log ',
]
SOURCE_COMMANDS = [
'checkout ',
'fetch ',
......@@ -79,7 +83,7 @@ MIXED_ELEMENTS = PROJECT_ELEMENTS + INVALID_ELEMENTS
def assert_completion(cli, cmd, word_idx, expected, cwd=None):
result = cli.run(cwd=cwd, env={
result = cli.run(project='.', cwd=cwd, env={
'_BST_COMPLETION': 'complete',
'COMP_WORDS': cmd,
'COMP_CWORD': str(word_idx)
......@@ -119,6 +123,7 @@ def assert_completion_failed(cli, cmd, word_idx, expected, cwd=None):
('bst ', 1, MAIN_COMMANDS),
('bst pu', 1, ['pull ', 'push ']),
('bst pul', 1, ['pull ']),
('bst artifacts ', 2, ARTIFACT_COMMANDS)
('bst source ', 2, SOURCE_COMMANDS),
('bst w ', 1, ['workspace ']),
('bst workspace ', 2, WORKSPACE_COMMANDS),
......@@ -218,8 +223,9 @@ def test_option_directory(datafiles, cli, cmd, word_idx, expected, subdir):
['compose-all.bst ', 'compose-include-bin.bst ', 'compose-exclude-dev.bst '], 'files'),
# Also try multi arguments together
('project', 'bst --directory ../ checkout t ', 4, ['target.bst '], 'files'),
('project', 'bst --directory ../ checkout target.bst ', 5, ['bin-files/', 'dev-files/'], 'files'),
('project', 'bst --directory ../ artifact checkout t ', 5, ['target.bst '], 'files'),
('project', 'bst --directory ../ artifact checkout --directory ', 6,
['bin-files/', 'dev-files/'], 'files'),
# When running in the project directory
('no-element-path', 'bst show ', 2,
......@@ -242,8 +248,9 @@ def test_option_directory(datafiles, cli, cmd, word_idx, expected, subdir):
['compose-all.bst ', 'compose-include-bin.bst ', 'compose-exclude-dev.bst '], 'files'),
# Also try multi arguments together
('no-element-path', 'bst --directory ../ checkout t ', 4, ['target.bst '], 'files'),
('no-element-path', 'bst --directory ../ checkout target.bst ', 5, ['bin-files/', 'dev-files/'], 'files'),
('no-element-path', 'bst --directory ../ artifact checkout t ', 5, ['target.bst '], 'files'),
('no-element-path', 'bst --directory ../ artifact checkout --directory ', 6,
['bin-files/', 'dev-files/'], 'files'),
# When element-path have sub-folders
('sub-folders', 'bst show base', 2, ['base/wanted.bst '], None),
......@@ -276,6 +283,7 @@ def test_argument_element_invalid(datafiles, cli, project, cmd, word_idx, expect
('bst help p', 2, ['pull ', 'push ']),
('bst help p', 2, ['pull ', 'push ']),
('bst help source ', 3, SOURCE_COMMANDS),
('bst help artifacts ', 3, ARTIFACT_COMMANDS),
('bst help w', 2, ['workspace ']),
('bst help workspace ', 3, WORKSPACE_COMMANDS),
])
......
tests/examples/autotools.py
View file @ 2c90cabb
......@@ -25,7 +25,7 @@ def test_autotools_build(cli, tmpdir, datafiles):
result = cli.run(project=project, args=['build', 'hello.bst'])
result.assert_success()
result = cli.run(project=project, args=['checkout', 'hello.bst', checkout])
result = cli.run(project=project, args=['artifact', 'checkout', 'hello.bst', '--directory', checkout])
result.assert_success()
assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
......
tests/examples/developing.py
View file @ 2c90cabb
......@@ -26,7 +26,7 @@ def test_autotools_build(cli, tmpdir, datafiles):
result = cli.run(project=project, args=['build', 'hello.bst'])
result.assert_success()
result = cli.run(project=project, args=['checkout', 'hello.bst', checkout])
result = cli.run(project=project, args=['artifact', 'checkout', 'hello.bst', '--directory', checkout])
result.assert_success()
assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
......
tests/examples/first-project.py
View file @ 2c90cabb
......@@ -23,7 +23,7 @@ def test_first_project_build_checkout(cli, tmpdir, datafiles):
result = cli.run(project=project, args=['build', 'hello.bst'])
assert result.exit_code == 0
result = cli.run(project=project, args=['checkout', 'hello.bst', checkout])
result = cli.run(project=project, args=['artifact', 'checkout', 'hello.bst', '--directory', checkout])
assert result.exit_code == 0
assert_contains(checkout, ['/hello.world'])
tests/examples/flatpak-autotools.py
View file @ 2c90cabb
......@@ -44,7 +44,7 @@ def test_autotools_build(cli, tmpdir, datafiles):
result = cli.run(project=project, args=['build', 'hello.bst'])
assert result.exit_code == 0
result = cli.run(project=project, args=['checkout', 'hello.bst', checkout])
result = cli.run(project=project, args=['artifact', 'checkout', 'hello.bst', '--directory', checkout])
assert result.exit_code == 0
assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
......
tests/frontend/buildcheckout.py
View file @ 2c90cabb
......@@ -44,10 +44,10 @@ def test_build_checkout(datafiles, cli, strict, hardlinks):
assert not os.listdir(builddir)
# Prepare checkout args
checkout_args = strict_args(['checkout'], strict)
checkout_args = strict_args(['artifact', 'checkout'], strict)
if hardlinks == "hardlinks":
checkout_args += ['--hardlinks']
checkout_args += ['target.bst', checkout]
checkout_args += ['target.bst', '--directory', checkout]
# Now check it out
result = cli.run(project=project, args=checkout_args)
......@@ -138,7 +138,8 @@ def test_build_checkout_deps(datafiles, cli, deps):
assert not os.listdir(builddir)
# Now check it out
result = cli.run(project=project, args=['checkout', element_name, '--deps', deps, checkout])
result = cli.run(project=project, args=['artifact', 'checkout', element_name,
'--deps', deps, '--directory', checkout])
result.assert_success()
# Verify output of this element
......@@ -169,7 +170,7 @@ def test_build_checkout_unbuilt(datafiles, cli):
checkout = os.path.join(cli.directory, 'checkout')
# Check that checking out an unbuilt element fails nicely
result = cli.run(project=project, args=['checkout', 'target.bst', checkout])
result = cli.run(project=project, args=['artifact', 'checkout', 'target.bst', '--directory', checkout])
result.assert_main_error(ErrorDomain.STREAM, "uncached-checkout-attempt")
......@@ -185,7 +186,7 @@ def test_build_checkout_tarball(datafiles, cli):
assert os.path.isdir(builddir)
assert not os.listdir(builddir)
checkout_args = ['checkout', '--tar', 'target.bst', checkout]
checkout_args = ['artifact', 'checkout', '--tar', checkout, 'target.bst']
result = cli.run(project=project, args=checkout_args)
result.assert_success()
......@@ -207,7 +208,7 @@ def test_build_checkout_tarball_stdout(datafiles, cli):
assert os.path.isdir(builddir)
assert not os.listdir(builddir)
checkout_args = ['checkout', '--tar', 'target.bst', '-']
checkout_args = ['artifact', 'checkout', '--tar', '-', 'target.bst']
result = cli.run(project=project, args=checkout_args, binary_capture=True)
result.assert_success()
......@@ -233,13 +234,13 @@ def test_build_checkout_tarball_is_deterministic(datafiles, cli):
assert os.path.isdir(builddir)
assert not os.listdir(builddir)
checkout_args = ['checkout', '--force', '--tar', 'target.bst']
checkout_args = ['artifact', 'checkout', '--force', 'target.bst']
checkout_args1 = checkout_args + [tarball1]
checkout_args1 = checkout_args + ['--tar', tarball1]
result = cli.run(project=project, args=checkout_args1)
result.assert_success()
checkout_args2 = checkout_args + [tarball2]
checkout_args2 = checkout_args + ['--tar', tarball2]
result = cli.run(project=project, args=checkout_args2)
result.assert_success()
......@@ -276,10 +277,10 @@ def test_build_checkout_nonempty(datafiles, cli, hardlinks):
f.write("Hello")
# Prepare checkout args
checkout_args = ['checkout']
checkout_args = ['artifact', 'checkout']
if hardlinks == "hardlinks":
checkout_args += ['--hardlinks']
checkout_args += ['target.bst', checkout]
checkout_args += ['target.bst', '--directory', checkout]
# Now check it out
result = cli.run(project=project, args=checkout_args)
......@@ -308,10 +309,10 @@ def test_build_checkout_force(datafiles, cli, hardlinks):
f.write("Hello")
# Prepare checkout args
checkout_args = ['checkout', '--force']
checkout_args = ['artifact', 'checkout', '--force']
if hardlinks == "hardlinks":
checkout_args += ['--hardlinks']
checkout_args += ['target.bst', checkout]
checkout_args += ['target.bst', '--directory', checkout]
# Now check it out
result = cli.run(project=project, args=checkout_args)
......@@ -345,7 +346,7 @@ def test_build_checkout_force_tarball(datafiles, cli):
with open(tarball, "w") as f:
f.write("Hello")
checkout_args = ['checkout', '--force', '--tar', 'target.bst', tarball]
checkout_args = ['artifact', 'checkout', '--force', '--tar', tarball, 'target.bst']
result = cli.run(project=project, args=checkout_args)
result.assert_success()
......@@ -393,7 +394,7 @@ def test_fetch_build_checkout(cli, tmpdir, datafiles, strict, kind):
# Now check it out
result = cli.run(project=project, args=strict_args([
'checkout', element_name, checkout
'artifact', 'checkout', element_name, '--directory', checkout
], strict))
result.assert_success()
......@@ -537,7 +538,7 @@ def test_build_checkout_junction(cli, tmpdir, datafiles):
# Now check it out
result = cli.run(project=project, args=[
'checkout', 'junction-dep.bst', checkout
'artifact', 'checkout', 'junction-dep.bst', '--directory', checkout
])
result.assert_success()
......@@ -600,7 +601,7 @@ def test_build_checkout_workspaced_junction(cli, tmpdir, datafiles):
# Now check it out
result = cli.run(project=project, args=[
'checkout', 'junction-dep.bst', checkout
'artifact', 'checkout', 'junction-dep.bst', '--directory', checkout
])
result.assert_success()
......@@ -624,7 +625,8 @@ def test_build_checkout_cross_junction(datafiles, cli, tmpdir):
result = cli.run(project=project, args=['build', 'junction.bst:import-etc.bst'])
result.assert_success()
result = cli.run(project=project, args=['checkout', 'junction.bst:import-etc.bst', checkout])
result = cli.run(project=project, args=['artifact', 'checkout', 'junction.bst:import-etc.bst',
'--directory', checkout])
result.assert_success()
filename = os.path.join(checkout, 'etc', 'animal.conf')
......
tests/frontend/compose_splits.py
View file @ 2c90cabb
......@@ -24,7 +24,7 @@ def test_compose_splits(datafiles, cli, target):
# Now check it out
result = cli.run(project=project, args=[
'checkout', target, checkout
'artifact', 'checkout', target, '--directory', checkout
])
result.assert_success()
......
tests/frontend/mirror.py
View file @ 2c90cabb
......@@ -856,7 +856,7 @@ def test_mirror_fallback_git_only_submodules(cli, tmpdir, datafiles):
result.assert_success()
checkout = os.path.join(str(tmpdir), 'checkout')
result = cli.run(project=project_dir, args=['checkout', element_name, checkout])
result = cli.run(project=project_dir, args=['artifact', 'checkout', element_name, '--directory', checkout])
result.assert_success()
assert os.path.exists(os.path.join(checkout, 'bin', 'bin', 'hello'))
......@@ -952,7 +952,7 @@ def test_mirror_fallback_git_with_submodules(cli, tmpdir, datafiles):
result.assert_success()
checkout = os.path.join(str(tmpdir), 'checkout')
result = cli.run(project=project_dir, args=['checkout', element_name, checkout])
result = cli.run(project=project_dir, args=['artifact', 'checkout', element_name, '--directory', checkout])
result.assert_success()
assert os.path.exists(os.path.join(checkout, 'bin', 'bin', 'hello'))
......
tests/frontend/workspace.py
View file @ 2c90cabb
......@@ -655,7 +655,7 @@ def test_build(cli, tmpdir_factory, datafiles, kind, strict, from_workspace, gue
# Checkout the result
result = cli.run(project=project,
args=args_dir + ['checkout'] + args_elm + [checkout])
args=args_dir + ['artifact', 'checkout', '--directory', checkout] + args_elm)
result.assert_success()
# Check that the pony.conf from the modified workspace exists
......@@ -757,7 +757,7 @@ def test_detect_modifications(cli, tmpdir, datafiles, modification, strict):
# Checkout the result
result = cli.run(project=project, args=[
'checkout', element_name, checkout
'artifact', 'checkout', element_name, '--directory', checkout
])
result.assert_success()
......@@ -1033,7 +1033,7 @@ def test_cache_key_workspace_in_dependencies(cli, tmpdir, datafiles, strict):
# Checkout the result
result = cli.run(project=project, args=[
'checkout', back_dep_element_name, checkout
'artifact', 'checkout', back_dep_element_name, '--directory', checkout
])
result.assert_success()
......
tests/integration/autotools.py
View file @ 2c90cabb
......@@ -28,7 +28,7 @@ def test_autotools_build(cli, tmpdir, datafiles):
result = cli.run(project=project, args=['build', element_name])
assert result.exit_code == 0
result = cli.run(project=project, args=['checkout', element_name, checkout])
result = cli.run(project=project, args=['artifact', 'checkout', element_name, '--directory', checkout])
assert result.exit_code == 0
assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
......@@ -51,7 +51,7 @@ def test_autotools_confroot_build(cli, tmpdir, datafiles):
result = cli.run(project=project, args=['build', element_name])
assert result.exit_code == 0
result = cli.run(project=project, args=['checkout', element_name, checkout])
result = cli.run(project=project, args=['artifact', 'checkout', element_name, '--directory', checkout])
assert result.exit_code == 0
assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
......
tests/integration/cachedfail.py
View file @ 2c90cabb
......@@ -54,7 +54,7 @@ def test_build_checkout_cached_fail(cli, tmpdir, datafiles):
# Now check it out
result = cli.run(project=project, args=[
'checkout', 'element.bst', checkout
'artifact', 'checkout', 'element.bst', '--directory', checkout
])
result.assert_success()
......
tests/integration/cmake.py
View file @ 2c90cabb
......@@ -25,7 +25,7 @@ def test_cmake_build(cli, tmpdir, datafiles):
result = cli.run(project=project, args=['build', element_name])
assert result.exit_code == 0
result = cli.run(project=project, args=['checkout', element_name, checkout])
result = cli.run(project=project, args=['artifact', 'checkout', element_name, '--directory', checkout])
assert result.exit_code == 0
assert_contains(checkout, ['/usr', '/usr/bin', '/usr/bin/hello'])
......@@ -41,7 +41,7 @@ def test_cmake_confroot_build(cli, tmpdir, datafiles):
result = cli.run(project=project, args=['build', element_name])
assert result.exit_code == 0
result = cli.run(project=project, args=['checkout', element_name, checkout])
result = cli.run(project=project, args=['artifact', 'checkout', element_name, '--directory', checkout])
assert result.exit_code == 0
assert_contains(checkout, ['/usr', '/usr/bin', '/usr/bin/hello'])
......
tests/integration/compose-symlinks.py
View file @ 2c90cabb
......@@ -36,7 +36,8 @@ def test_compose_symlinks(cli, tmpdir, datafiles):
result = cli.run(project=project, args=['build', 'compose-symlinks/compose.bst'])
result.assert_success()
result = cli.run(project=project, args=['checkout', 'compose-symlinks/compose.bst', checkout])
result = cli.run(project=project, args=['artifact', 'checkout', 'compose-symlinks/compose.bst',
'--directory', checkout])
result.assert_success()
assert set(walk_dir(checkout)) == set(['/sbin', '/usr', '/usr/sbin',
......
tests/integration/compose.py
View file @ 2c90cabb
......@@ -97,7 +97,7 @@ def test_compose_include(cli, tmpdir, datafiles, include_domains,
result = cli.run(project=project, args=['build', element_name])
assert result.exit_code == 0
result = cli.run(project=project, args=['checkout', element_name, checkout])
result = cli.run(project=project, args=['artifact', 'checkout', element_name, '--directory', checkout])
assert result.exit_code == 0
assert set(walk_dir(checkout)) == set(expected)
tests/integration/import.py
View file @ 2c90cabb
......@@ -53,7 +53,7 @@ def test_import(cli, tmpdir, datafiles, source, target, path, expected):
res = cli.run(project=project, args=['build', element_name])
assert res.exit_code == 0
cli.run(project=project, args=['checkout', element_name, checkout])
cli.run(project=project, args=['artifact', 'checkout', element_name, '--directory', checkout])
assert res.exit_code == 0
assert set(walk_dir(checkout)) == set(expected)
tests/integration/make.py
View file @ 2c90cabb
......@@ -28,7 +28,7 @@ def test_make_build(cli, tmpdir, datafiles):
result = cli.run(project=project, args=['build', element_name])
assert result.exit_code == 0
result = cli.run(project=project, args=['checkout', element_name, checkout])
result = cli.run(project=project, args=['artifact', 'checkout', element_name, '--directory', checkout])
assert result.exit_code == 0
assert_contains(checkout, ['/usr', '/usr/bin',
......