[Notes] [Git][BuildStream/buildstream][willsalmon/shellBuildTrees] 5 commits: buildstream/data/projectconfig.yaml: Remove default strip-binaries

[Will Salmon <gitlab mg gitlab com>]

Title: GitLab

Will Salmon pushed to branch willsalmon/shellBuildTrees at BuildStream / buildstream

Commits:

• 56c2c2cc
  by Javier Jardón at 2018-12-09T16:59:26Z

  buildstream/data/projectconfig.yaml: Remove default strip-binaries
  
  They are too specific to be included by default
  
  Recommendation is if you are building in Linux is to use the
  ones begin used in the freedesktop-sdk project, for example
  
  See #645
  

• dcb6b5e8
  by Javier Jardón at 2018-12-09T16:59:26Z

  NEWS: Update for removal of default strip-commands
  

• ae0afce5
  by Javier Jardón at 2018-12-09T17:08:16Z

  buildstream/buildelement.py: Document where to find strip commands for Linux
  

• 873b618c
  by Javier Jardón at 2018-12-10T09:49:52Z

  Merge branch 'jjardon/strip-binaries-removal' into 'master'
  
  Remove default strip-commands
  
  Closes #645
  
  See merge request BuildStream/buildstream!987

• 7e3c1771
  by William Salmon at 2018-12-11T12:30:42Z

  Basic options for shell --build to use buildtrees
  
  Fixes issue #740
  

17 changed files:

• NEWS
• buildstream/_frontend/cli.py
• buildstream/_stream.py
• buildstream/buildelement.py
• buildstream/data/projectconfig.yaml
• buildstream/element.py
• tests/cachekey/project/elements/build1.expected
• tests/cachekey/project/elements/build2.expected
• tests/cachekey/project/target.expected
• tests/examples/autotools.py
• tests/examples/developing.py
• tests/examples/flatpak-autotools.py
• tests/integration/autotools.py
• tests/integration/build-tree.py
• tests/integration/cmake.py
• tests/integration/compose.py
• tests/testutils/runcli.py

Changes:

NEWS

---

...	...	@@ -2,6 +2,10 @@
2	2	buildstream 1.3.1
3	3	=================
4	4
	5	+ o BREAKING CHANGE: Default strip-commands have been removed as they are too
	6	+ specific. Recommendation if you are building in Linux is to use the
	7	+ ones being used in freedesktop-sdk project, for example
	8	+
5	9	o All elements must now be suffixed with `.bst`
6	10	Attempting to use an element that does not have the `.bst` extension,
7	11	will result in a warning.

buildstream/_frontend/cli.py

---

...	...	@@ -582,11 +582,14 @@ def show(app, elements, deps, except_, order, format_):
582	582	help="Mount a file or directory into the sandbox")
583	583	@click.option('--isolate', is_flag=True, default=False,
584	584	help='Create an isolated build sandbox')
	585	+@click.option('--use-buildtree', '-t', 'cli_buildtree', type=click.Choice(['ask', 'if_available', 'always', 'never']),
	586	+ default='ask',
	587	+ help='Defaults to ask but if set to always the function will fail if a build tree is not available')
585	588	@click.argument('element',
586	589	type=click.Path(readable=False))
587	590	@click.argument('command', type=click.STRING, nargs=-1)
588	591	@click.pass_obj
589		-def shell(app, element, sysroot, mount, isolate, build_, command):
	592	+def shell(app, element, sysroot, mount, isolate, build_, cli_buildtree, command):
590	593	"""Run a command in the target element's sandbox environment
591	594
592	595	This will stage a temporary sysroot for running the target
...	...	@@ -612,6 +615,9 @@ def shell(app, element, sysroot, mount, isolate, build_, command):
612	615	else:
613	616	scope = Scope.RUN
614	617
	618	+ cli_buildtree = cli_buildtree.lower().strip()
	619	+ use_buildtree = False
	620	+
615	621	with app.initialized():
616	622	dependencies = app.stream.load_selection((element,), selection=PipelineSelection.NONE)
617	623	element = dependencies[0]
...	...	@@ -620,12 +626,32 @@ def shell(app, element, sysroot, mount, isolate, build_, command):
620	626	HostMount(path, host_path)
621	627	for host_path, path in mount
622	628	]
	629	+
	630	+
	631	+ element._cached()#_cached_success
	632	+ cached = bool(element._cached_buildtree())
	633	+ if cli_buildtree == "always":
	634	+ if cached:
	635	+ use_buildtree = True
	636	+ else:
	637	+ raise AppError("No buildtree is cached but the use buildtree option was specified")
	638	+ elif cli_buildtree == "never":
	639	+ pass
	640	+ elif cli_buildtree == "if_available":
	641	+ use_buildtree = cachedi
	642	+ else:
	643	+ if app.interactive and cached:
	644	+ use_buildtree = bool(click.confirm('Do you want to use the cached buildtree?'))
	645	+ if use_buildtree and not element._cached_success():
	646	+ click.echo("Warning: using a buildtree from a failed build.")
	647	+
623	648	try:
624	649	exitcode = app.stream.shell(element, scope, prompt,
625	650	directory=sysroot,
626	651	mounts=mounts,
627	652	isolate=isolate,
628		- command=command)
	653	+ command=command,
	654	+ usebuildtree=use_buildtree)
629	655	except BstError as e:
630	656	raise AppError("Error launching shell: {}".format(e), detail=e.detail) from e
631	657

buildstream/_stream.py

---

...	...	@@ -132,7 +132,8 @@ class Stream():
132	132	directory=None,
133	133	mounts=None,
134	134	isolate=False,
135		- command=None):
	135	+ command=None,
	136	+ usebuildtree=None):
136	137
137	138	# Assert we have everything we need built, unless the directory is specified
138	139	# in which case we just blindly trust the directory, using the element
...	...	@@ -147,7 +148,8 @@ class Stream():
147	148	raise StreamError("Elements need to be built or downloaded before staging a shell environment",
148	149	detail="\n".join(missing_deps))
149	150
150		- return element._shell(scope, directory, mounts=mounts, isolate=isolate, prompt=prompt, command=command)
	151	+ return element._shell(scope, directory, mounts=mounts, isolate=isolate, prompt=prompt, command=command,
	152	+ usebuildtree=usebuildtree)
151	153
152	154	# build()
153	155	#

buildstream/buildelement.py

---

...	...	@@ -35,6 +35,14 @@ This section will give a brief summary of how some of the common features work,
35	35	some of them or the variables they use will be further detailed in the following
36	36	sections.
37	37
	38	+The `strip-binaries` variable
	39	+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	40	+The `strip-binaries` variable is by default **empty**. You need to use the
	41	+appropiate commands depending of the system you are building.
	42	+If you are targetting Linux, ones known to work are the ones used by the
	43	+`freedesktop-sdk <https://freedesktop-sdk.io/>`_, you can take a look to them in their
	44	+`project.conf <https://gitlab.com/freedesktop-sdk/freedesktop-sdk/blob/freedesktop-sdk-18.08.21/project.conf#L74>`_
	45	+
38	46	Location for running commands
39	47	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
40	48	The ``command-subdir`` variable sets where the build commands will be executed,

buildstream/data/projectconfig.yaml

---

...	...	@@ -44,38 +44,8 @@ variables:
44	44	# Indicates the build installation directory in the sandbox
45	45	install-root: /buildstream-install
46	46
47		- # Arguments for tooling used when stripping debug symbols
48		- objcopy-link-args: --add-gnu-debuglink
49		- objcopy-extract-args: |
50		-
51		- --only-keep-debug --compress-debug-sections
52		-
53		- strip-args: |
54		-
55		- --remove-section=.comment --remove-section=.note --strip-unneeded
56		-
57		- # Generic implementation for stripping debugging symbols
58		- strip-binaries: |
59		-
60		- cd "%{install-root}" && find -type f \
61		- '(' -perm -111 -o -name '*.so*' \
62		- -o -name '*.cmxs' -o -name '*.node' ')' \
63		- -exec sh -ec \
64		- 'read -n4 hdr <"$1" # check for elf header
65		- case "$1" in
66		- %{install-root}%{debugdir}/*)
67		- exit 0
68		- ;;
69		- esac
70		- if [ "$hdr" != "$(printf \\x7fELF)" ]; then
71		- exit 0
72		- fi
73		- debugfile="%{install-root}%{debugdir}/$1"
74		- mkdir -p "$(dirname "$debugfile")"
75		- objcopy %{objcopy-extract-args} "$1" "$debugfile"
76		- chmod 644 "$debugfile"
77		- strip %{strip-args} "$1"
78		- objcopy %{objcopy-link-args} "$debugfile" "$1"' - {} ';'
	47	+ # You need to override this with the commands specific for your system
	48	+ strip-binaries: ""
79	49
80	50	# Generic implementation for reproducible python builds
81	51	fix-pyc-timestamps: |
...	...	@@ -196,4 +166,4 @@ shell:
196	166
197	167	# Command to run when `bst shell` does not provide a command
198	168	#
199		- command: [ 'sh', '-i' ]
		\ No newline at end of file
	169	+ command: [ 'sh', '-i' ]

buildstream/element.py

---

...	...	@@ -1338,11 +1338,12 @@ class Element(Plugin):
1338	1338	# is used to stage things by the `bst checkout` codepath
1339	1339	#
1340	1340	@contextmanager
1341		- def _prepare_sandbox(self, scope, directory, shell=False, integrate=True):
	1341	+ def _prepare_sandbox(self, scope, directory, shell=False, integrate=True, usebuildtree=None):
1342	1342	# bst shell and bst checkout require a local sandbox.
1343	1343	bare_directory = True if directory else False
1344	1344	with self.__sandbox(directory, config=self.__sandbox_config, allow_remote=False,
1345	1345	bare_directory=bare_directory) as sandbox:
	1346	+ sandbox.usebuildtree = usebuildtree
1346	1347
1347	1348	# Configure always comes first, and we need it.
1348	1349	self.__configure_sandbox(sandbox)
...	...	@@ -1386,7 +1387,7 @@ class Element(Plugin):
1386	1387	# Stage all sources that need to be copied
1387	1388	sandbox_vroot = sandbox.get_virtual_directory()
1388	1389	host_vdirectory = sandbox_vroot.descend(directory.lstrip(os.sep).split(os.sep), create=True)
1389		- self._stage_sources_at(host_vdirectory, mount_workspaces=mount_workspaces)
	1390	+ self._stage_sources_at(host_vdirectory, mount_workspaces=mount_workspaces, usebuildtree=sandbox.usebuildtree)
1390	1391
1391	1392	# _stage_sources_at():
1392	1393	#
...	...	@@ -1396,9 +1397,8 @@ class Element(Plugin):
1396	1397	# vdirectory (:class:`.storage.Directory`): A virtual directory object to stage sources into.
1397	1398	# mount_workspaces (bool): mount workspaces if True, copy otherwise
1398	1399	#
1399		- def _stage_sources_at(self, vdirectory, mount_workspaces=True):
	1400	+ def _stage_sources_at(self, vdirectory, mount_workspaces=True, usebuildtree=False):
1400	1401	with self.timed_activity("Staging sources", silent_nested=True):
1401		-
1402	1402	if not isinstance(vdirectory, Directory):
1403	1403	vdirectory = FileBasedDirectory(vdirectory)
1404	1404	if not vdirectory.is_empty():
...	...	@@ -1420,7 +1420,7 @@ class Element(Plugin):
1420	1420	.format(workspace.get_absolute_path())):
1421	1421	workspace.stage(temp_staging_directory)
1422	1422	# Check if we have a cached buildtree to use
1423		- elif self._cached_buildtree():
	1423	+ elif usebuildtree:
1424	1424	artifact_base, _ = self.__extract()
1425	1425	import_dir = os.path.join(artifact_base, 'buildtree')
1426	1426	else:
...	...	@@ -1854,9 +1854,10 @@ class Element(Plugin):
1854	1854	# Returns: Exit code
1855	1855	#
1856	1856	# If directory is not specified, one will be staged using scope
1857		- def _shell(self, scope=None, directory=None, *, mounts=None, isolate=False, prompt=None, command=None):
	1857	+ def _shell(self, scope=None, directory=None, *, mounts=None, isolate=False, prompt=None, command=None,
	1858	+ usebuildtree=None):
1858	1859
1859		- with self._prepare_sandbox(scope, directory, shell=True) as sandbox:
	1860	+ with self._prepare_sandbox(scope, directory, shell=True, usebuildtree=usebuildtree) as sandbox:
1860	1861	environment = self.get_environment()
1861	1862	environment = copy.copy(environment)
1862	1863	flags = SandboxFlags.INTERACTIVE | SandboxFlags.ROOT_READ_ONLY
...	...	@@ -2231,7 +2232,6 @@ class Element(Plugin):
2231	2232	specs=self.__remote_execution_specs,
2232	2233	bare_directory=bare_directory,
2233	2234	allow_real_directory=False)
2234		- yield sandbox
2235	2235
2236	2236	elif directory is not None and os.path.exists(directory):
2237	2237	if allow_remote and self.__remote_execution_specs:
...	...	@@ -2249,7 +2249,6 @@ class Element(Plugin):
2249	2249	config=config,
2250	2250	bare_directory=bare_directory,
2251	2251	allow_real_directory=not self.BST_VIRTUAL_DIRECTORY)
2252		- yield sandbox
2253	2252
2254	2253	else:
2255	2254	os.makedirs(context.builddir, exist_ok=True)
...	...	@@ -2263,6 +2262,10 @@ class Element(Plugin):
2263	2262	# Cleanup the build dir
2264	2263	utils._force_rmtree(rootdir)
2265	2264
	2265	+ return
	2266	+ sandbox.usebuildtree = None
	2267	+ yield sandbox
	2268	+
2266	2269	def __compose_default_splits(self, defaults):
2267	2270	project = self._get_project()
2268	2271

tests/cachekey/project/elements/build1.expected

---

1		-a0d000abc1dea8714cd27f348d0b798b35e7246c44e330c4b3f7912fabacc6db
		\ No newline at end of file
	1	+dadb8f86874f714b4f6d4c9025332934efb7e85c38f6a68b1267746ae8f43f24

tests/cachekey/project/elements/build2.expected

---

1		-79f546a78748d943a6958c99ab4ad03305f96fefd0b424b6b246b0c9816e00c6
		\ No newline at end of file
	1	+f81cefce283dd3581ba2fc865ff9c2763119274b114b12edb4e87196cfff8b2a

tests/cachekey/project/target.expected

---

1		-d6d283ed1fb0467fcfa5bf69f8596d0f0ac6638281bc9d8e52e1212e2ec0bcab
		\ No newline at end of file
	1	+92dae6a712b4f91f4fdbdf8dad732cf07ff4da092a319fa4f4b261a9287640de

tests/examples/autotools.py

---

...	...	@@ -29,9 +29,7 @@ def test_autotools_build(cli, tmpdir, datafiles):
29	29	result.assert_success()
30	30
31	31	assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
32		- '/usr/share', '/usr/lib/debug',
33		- '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
34		- '/usr/lib/debug/usr/bin/hello',
	32	+ '/usr/share',
35	33	'/usr/bin/hello',
36	34	'/usr/share/doc', '/usr/share/doc/amhello',
37	35	'/usr/share/doc/amhello/README'])

tests/examples/developing.py

---

...	...	@@ -30,9 +30,7 @@ def test_autotools_build(cli, tmpdir, datafiles):
30	30	result.assert_success()
31	31
32	32	assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
33		- '/usr/share', '/usr/lib/debug',
34		- '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
35		- '/usr/lib/debug/usr/bin/hello',
	33	+ '/usr/share',
36	34	'/usr/bin/hello'])
37	35
38	36

tests/examples/flatpak-autotools.py

---

...	...	@@ -48,9 +48,7 @@ def test_autotools_build(cli, tmpdir, datafiles):
48	48	assert result.exit_code == 0
49	49
50	50	assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
51		- '/usr/share', '/usr/lib/debug',
52		- '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
53		- '/usr/lib/debug/usr/bin/hello',
	51	+ '/usr/share',
54	52	'/usr/bin/hello', '/usr/share/doc',
55	53	'/usr/share/doc/amhello',
56	54	'/usr/share/doc/amhello/README'])

tests/integration/autotools.py

---

...	...	@@ -32,9 +32,7 @@ def test_autotools_build(cli, tmpdir, datafiles):
32	32	assert result.exit_code == 0
33	33
34	34	assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
35		- '/usr/share', '/usr/lib/debug',
36		- '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
37		- '/usr/lib/debug/usr/bin/hello',
	35	+ '/usr/share',
38	36	'/usr/bin/hello', '/usr/share/doc',
39	37	'/usr/share/doc/amhello',
40	38	'/usr/share/doc/amhello/README'])
...	...	@@ -57,9 +55,7 @@ def test_autotools_confroot_build(cli, tmpdir, datafiles):
57	55	assert result.exit_code == 0
58	56
59	57	assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
60		- '/usr/share', '/usr/lib/debug',
61		- '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
62		- '/usr/lib/debug/usr/bin/hello',
	58	+ '/usr/share',
63	59	'/usr/bin/hello', '/usr/share/doc',
64	60	'/usr/share/doc/amhello',
65	61	'/usr/share/doc/amhello/README'])

tests/integration/build-tree.py

---

...	...	@@ -19,7 +19,9 @@ DATA_DIR = os.path.join(
19	19	@pytest.mark.datafiles(DATA_DIR)
20	20	@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
21	21	def test_buildtree_staged(cli_integration, tmpdir, datafiles):
22		- # i.e. tests that cached build trees are staged by `bst shell --build`
	22	+ # By default we ask about staging build trees but we can only ask
	23	+ # in a interactive session so by default trees are not staged by
	24	+ # `bst shell --build` in the tests
23	25	project = os.path.join(datafiles.dirname, datafiles.basename)
24	26	element_name = 'build-shell/buildtree.bst'
25	27
...	...	@@ -27,15 +29,50 @@ def test_buildtree_staged(cli_integration, tmpdir, datafiles):
27	29	res.assert_success()
28	30
29	31	res = cli_integration.run(project=project, args=[
30		- 'shell', '--build', element_name, '--', 'grep', '-q', 'Hi', 'test'
	32	+ 'shell', '--build', element_name, '--', 'cat', 'test'
	33	+ ])
	34	+ res.assert_shell_error()
	35	+
	36	+
	37	+@pytest.mark.datafiles(DATA_DIR)
	38	+@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
	39	+def test_buildtree_staged_forced_true(cli_integration, tmpdir, datafiles):
	40	+ # Test that if we ask for a build tree it is there.
	41	+ project = os.path.join(datafiles.dirname, datafiles.basename)
	42	+ element_name = 'build-shell/buildtree.bst'
	43	+
	44	+ res = cli_integration.run(project=project, args=['build', element_name])
	45	+ res.assert_success()
	46	+
	47	+ res = cli_integration.run(project=project, args=[
	48	+ 'shell', '--build', '--use-buildtree', 'always', element_name, '--', 'cat', 'test'
31	49	])
32	50	res.assert_success()
	51	+ assert 'Hi' in res.output
	52	+
	53	+
	54	+@pytest.mark.datafiles(DATA_DIR)
	55	+@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
	56	+def test_buildtree_staged_forced_false(cli_integration, tmpdir, datafiles):
	57	+ # Test that if we ask not to have a build tree it is not there
	58	+ project = os.path.join(datafiles.dirname, datafiles.basename)
	59	+ element_name = 'build-shell/buildtree.bst'
	60	+
	61	+ res = cli_integration.run(project=project, args=['build', element_name])
	62	+ res.assert_success()
	63	+
	64	+ res = cli_integration.run(project=project, args=[
	65	+ 'shell', '--build', '--use-buildtree', 'never', element_name, '--', 'cat', 'test'
	66	+ ])
	67	+ res.assert_shell_error()
	68	+
	69	+ assert 'Hi' not in res.output
33	70
34	71
35	72	@pytest.mark.datafiles(DATA_DIR)
36	73	@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
37	74	def test_buildtree_from_failure(cli_integration, tmpdir, datafiles):
38		- # i.e. test that on a build failure, we can still shell into it
	75	+ # Test that we can use a build tree after a failure
39	76	project = os.path.join(datafiles.dirname, datafiles.basename)
40	77	element_name = 'build-shell/buildtree-fail.bst'
41	78
...	...	@@ -44,9 +81,10 @@ def test_buildtree_from_failure(cli_integration, tmpdir, datafiles):
44	81
45	82	# Assert that file has expected contents
46	83	res = cli_integration.run(project=project, args=[
47		- 'shell', '--build', element_name, '--', 'cat', 'test'
	84	+ 'shell', '--build', element_name, '--use-buildtree', 'always', '--', 'cat', 'test'
48	85	])
49	86	res.assert_success()
	87	+ assert "Warning: using a buildtree from a failed build" in res.output
50	88	assert 'Hi' in res.output
51	89
52	90
...	...	@@ -80,6 +118,58 @@ def test_buildtree_pulled(cli, tmpdir, datafiles):
80	118
81	119	# Check it's using the cached build tree
82	120	res = cli.run(project=project, args=[
83		- 'shell', '--build', element_name, '--', 'grep', '-q', 'Hi', 'test'
	121	+ 'shell', '--build', element_name, '--use-buildtree', 'always', '--', 'cat', 'test'
84	122	])
85	123	res.assert_success()
	124	+
	125	+
	126	+# This test checks for correct behaviour if a buildtree is not present.
	127	+@pytest.mark.datafiles(DATA_DIR)
	128	+@pytest.mark.skipif(IS_LINUX and not HAVE_BWRAP, reason='Only available with bubblewrap on Linux')
	129	+def test_buildtree_options(cli, tmpdir, datafiles):
	130	+ project = os.path.join(datafiles.dirname, datafiles.basename)
	131	+ element_name = 'build-shell/buildtree.bst'
	132	+
	133	+ with create_artifact_share(os.path.join(str(tmpdir), 'artifactshare')) as share:
	134	+ # Build the element to push it to cache
	135	+ cli.configure({
	136	+ 'artifacts': {'url': share.repo, 'push': True}
	137	+ })
	138	+ result = cli.run(project=project, args=['build', element_name])
	139	+ result.assert_success()
	140	+ assert cli.get_element_state(project, element_name) == 'cached'
	141	+
	142	+ # Discard the cache
	143	+ cli.configure({
	144	+ 'artifacts': {'url': share.repo, 'push': True},
	145	+ 'artifactdir': os.path.join(cli.directory, 'artifacts2')
	146	+ })
	147	+ assert cli.get_element_state(project, element_name) != 'cached'
	148	+
	149	+ # Pull from cache, but do not include buildtrees.
	150	+ result = cli.run(project=project, args=['pull', '--deps', 'all', element_name])
	151	+ result.assert_success()
	152	+
	153	+ # The above is the simplest way I know to create a local cache without any buildtrees.
	154	+
	155	+ # Check it's not using the cached build tree
	156	+ res = cli.run(project=project, args=[
	157	+ 'shell', '--build', element_name, '--use-buildtree', 'never', '--', 'cat', 'test'
	158	+ ])
	159	+ res.assert_shell_error()
	160	+ assert 'Hi' not in res.output
	161	+
	162	+ # Check it's not using the cached build tree, default is to ask, and fall back to not
	163	+ # for non interactive behavior
	164	+ res = cli.run(project=project, args=[
	165	+ 'shell', '--build', element_name, '--', 'cat', 'test'
	166	+ ])
	167	+ res.assert_shell_error()
	168	+ assert 'Hi' not in res.output
	169	+
	170	+ # Check it's using the cached build tree
	171	+ res = cli.run(project=project, args=[
	172	+ 'shell', '--build', element_name, '--use-buildtree', 'always', '--', 'cat', 'test'
	173	+ ])
	174	+ res.assert_main_error(ErrorDomain.PROG_NOT_FOUND, None)
	175	+ assert 'Hi' not in res.output

tests/integration/cmake.py

---

...	...	@@ -28,10 +28,7 @@ def test_cmake_build(cli, tmpdir, datafiles):
28	28	result = cli.run(project=project, args=['checkout', element_name, checkout])
29	29	assert result.exit_code == 0
30	30
31		- assert_contains(checkout, ['/usr', '/usr/bin', '/usr/bin/hello',
32		- '/usr/lib/debug', '/usr/lib/debug/usr',
33		- '/usr/lib/debug/usr/bin',
34		- '/usr/lib/debug/usr/bin/hello'])
	31	+ assert_contains(checkout, ['/usr', '/usr/bin', '/usr/bin/hello'])
35	32
36	33
37	34	@pytest.mark.datafiles(DATA_DIR)
...	...	@@ -47,10 +44,7 @@ def test_cmake_confroot_build(cli, tmpdir, datafiles):
47	44	result = cli.run(project=project, args=['checkout', element_name, checkout])
48	45	assert result.exit_code == 0
49	46
50		- assert_contains(checkout, ['/usr', '/usr/bin', '/usr/bin/hello',
51		- '/usr/lib/debug', '/usr/lib/debug/usr',
52		- '/usr/lib/debug/usr/bin',
53		- '/usr/lib/debug/usr/bin/hello'])
	47	+ assert_contains(checkout, ['/usr', '/usr/bin', '/usr/bin/hello'])
54	48
55	49
56	50	@pytest.mark.datafiles(DATA_DIR)

tests/integration/compose.py

---

...	...	@@ -38,48 +38,40 @@ def create_compose_element(name, path, config={}):
38	38	@pytest.mark.datafiles(DATA_DIR)
39	39	@pytest.mark.parametrize("include_domains,exclude_domains,expected", [
40	40	# Test flat inclusion
41		- ([], [], ['/usr', '/usr/lib', '/usr/bin',
42		- '/usr/share', '/usr/lib/debug',
43		- '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
44		- '/usr/lib/debug/usr/bin/hello', '/usr/bin/hello',
	41	+ ([], [], ['/usr', '/usr/bin',
	42	+ '/usr/share',
	43	+ '/usr/bin/hello',
45	44	'/usr/share/doc', '/usr/share/doc/amhello',
46	45	'/usr/share/doc/amhello/README',
47	46	'/tests', '/tests/test']),
48	47	# Test only runtime
49		- (['runtime'], [], ['/usr', '/usr/lib', '/usr/share',
	48	+ (['runtime'], [], ['/usr', '/usr/share',
50	49	'/usr/bin', '/usr/bin/hello']),
51	50	# Test with runtime and doc
52		- (['runtime', 'doc'], [], ['/usr', '/usr/lib', '/usr/share',
	51	+ (['runtime', 'doc'], [], ['/usr', '/usr/share',
53	52	'/usr/bin', '/usr/bin/hello',
54	53	'/usr/share/doc', '/usr/share/doc/amhello',
55	54	'/usr/share/doc/amhello/README']),
56	55	# Test with only runtime excluded
57		- ([], ['runtime'], ['/usr', '/usr/lib', '/usr/share',
58		- '/usr/lib/debug', '/usr/lib/debug/usr',
59		- '/usr/lib/debug/usr/bin',
60		- '/usr/lib/debug/usr/bin/hello',
	56	+ ([], ['runtime'], ['/usr', '/usr/share',
61	57	'/usr/share/doc', '/usr/share/doc/amhello',
62	58	'/usr/share/doc/amhello/README',
63	59	'/tests', '/tests/test']),
64	60	# Test with runtime and doc excluded
65		- ([], ['runtime', 'doc'], ['/usr', '/usr/lib', '/usr/share',
66		- '/usr/lib/debug', '/usr/lib/debug/usr',
67		- '/usr/lib/debug/usr/bin',
68		- '/usr/lib/debug/usr/bin/hello',
	61	+ ([], ['runtime', 'doc'], ['/usr', '/usr/share',
69	62	'/tests', '/tests/test']),
70	63	# Test with runtime simultaneously in- and excluded
71		- (['runtime'], ['runtime'], ['/usr', '/usr/lib', '/usr/share']),
	64	+ (['runtime'], ['runtime'], ['/usr', '/usr/share']),
72	65	# Test with runtime included and doc excluded
73		- (['runtime'], ['doc'], ['/usr', '/usr/lib', '/usr/share',
	66	+ (['runtime'], ['doc'], ['/usr', '/usr/share',
74	67	'/usr/bin', '/usr/bin/hello']),
75	68	# Test including a custom 'test' domain
76		- (['test'], [], ['/usr', '/usr/lib', '/usr/share',
	69	+ (['test'], [], ['/usr', '/usr/share',
77	70	'/tests', '/tests/test']),
78	71	# Test excluding a custom 'test' domain
79		- ([], ['test'], ['/usr', '/usr/lib', '/usr/bin',
80		- '/usr/share', '/usr/lib/debug',
81		- '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
82		- '/usr/lib/debug/usr/bin/hello', '/usr/bin/hello',
	72	+ ([], ['test'], ['/usr', '/usr/bin',
	73	+ '/usr/share',
	74	+ '/usr/bin/hello',
83	75	'/usr/share/doc', '/usr/share/doc/amhello',
84	76	'/usr/share/doc/amhello/README'])
85	77	])

tests/testutils/runcli.py

---

...	...	@@ -153,6 +153,20 @@ class Result():
153	153	assert self.task_error_domain == error_domain, fail_message
154	154	assert self.task_error_reason == error_reason, fail_message
155	155
	156	+ # assert_shell_error()
	157	+ #
	158	+ # Asserts that the buildstream created a shell and that the task in the
	159	+ # shell failed.
	160	+ #
	161	+ # Args:
	162	+ # fail_message (str): An optional message to override the automatic
	163	+ # assertion error messages
	164	+ # Raises:
	165	+ # (AssertionError): If any of the assertions fail
	166	+ #
	167	+ def assert_shell_error(self, fail_message=''):
	168	+ assert self.exit_code == 1, fail_message
	169	+
156	170	# get_tracked_elements()
157	171	#
158	172	# Produces a list of element names on which tracking occurred

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.