[Notes] [Git][BuildStream/buildstream][tristan/debug-symbols-location] Don't strip pathname from debug symbol files

[Tristan Van Berkom <gitlab mg gitlab com>]

Title: GitLab

Tristan Van Berkom pushed to branch tristan/debug-symbols-location at BuildStream / buildstream

Commits:

• f4e51cf1
  by Sam Thursfield at 2018-08-22T10:38:41Z

  Don't strip pathname from debug symbol files
  
  When GDB looks for debug symbols it looks for the full path of the file
  inside the configured debug-file-directory. For example, if the
  debug-file-directory is set to a default of /usr/lib/debug, and you are
  debugging /usr/bin/python3, GDB will look for its debug symbols at this
  location: /usr/lib/debug/usr/bin/python3.
  
  BuildStream has been putting all debug files inside /usr/lib/debug
  under their $(basename), so in the above example GDB would fail to find
  any debug symbols for /usr/bin/python3 because they would be in the
  incorrect locatoin of /usr/lib/debug/python3.
  

10 changed files:

• buildstream/data/projectconfig.yaml
• 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/cmake.py
• tests/integration/compose.py

Changes:

buildstream/data/projectconfig.yaml

---

...	...	@@ -68,7 +68,7 @@ variables:
68	68	# Generic implementation for stripping debugging symbols
69	69	strip-binaries: |
70	70
71		- find "%{install-root}" -type f \
	71	+ cd "%{install-root}" && find -type f \
72	72	'(' -perm -111 -o -name '*.so*' \
73	73	-o -name '*.cmxs' -o -name '*.node' ')' \
74	74	-exec sh -ec \
...	...	@@ -76,7 +76,7 @@ variables:
76	76	if [ "$hdr" != "$(printf \\x7fELF)" ]; then
77	77	exit 0
78	78	fi
79		- debugfile="%{install-root}%{debugdir}/$(basename "$1")"
	79	+ debugfile="%{install-root}%{debugdir}/$1"
80	80	mkdir -p "$(dirname "$debugfile")"
81	81	objcopy %{objcopy-extract-args} "$1" "$debugfile"
82	82	chmod 644 "$debugfile"

tests/cachekey/project/elements/build1.expected

---

1		-90fa9c1b5334aac3bfd8956d92af0a91e2f2bbcbcac73861957165e577bc8768
		\ No newline at end of file
	1	+05429485dff08bdb968f7d10c2cdda63be49c8a783d54863a0d4abce44bbebe9
		\ No newline at end of file

tests/cachekey/project/elements/build2.expected

---

1		-a62c29fe4e05820412e391430f61aa88a1a82e138de8cac726a9dc4fcd7ed8b9
		\ No newline at end of file
	1	+4155c7bc836cdb092de3241fa92883bd8c7dd94c55affa406e559aeb6252c669
		\ No newline at end of file

tests/cachekey/project/target.expected

---

1		-09620aa58875d96611d22632b7585a0f22f88f5ecca6f5d1915d3e529d036bd8
		\ No newline at end of file
	1	+f5affaacd3ac724f5415a7a8349c6dca6122841dd7f9769de4f9d6cb7185f9b8
		\ No newline at end of file

tests/examples/autotools.py

---

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

tests/examples/developing.py

---

...	...	@@ -29,7 +29,9 @@ def test_autotools_build(cli, tmpdir, datafiles):
29	29
30	30	assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
31	31	'/usr/share', '/usr/lib/debug',
32		- '/usr/lib/debug/hello', '/usr/bin/hello'])
	32	+ '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
	33	+ '/usr/lib/debug/usr/bin/hello',
	34	+ '/usr/bin/hello'])
33	35
34	36
35	37	# Test the unmodified hello command works as expected.

tests/examples/flatpak-autotools.py

---

...	...	@@ -47,8 +47,10 @@ def test_autotools_build(cli, tmpdir, datafiles):
47	47
48	48	assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
49	49	'/usr/share', '/usr/lib/debug',
50		- '/usr/lib/debug/hello', '/usr/bin/hello',
51		- '/usr/share/doc', '/usr/share/doc/amhello',
	50	+ '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
	51	+ '/usr/lib/debug/usr/bin/hello',
	52	+ '/usr/bin/hello', '/usr/share/doc',
	53	+ '/usr/share/doc/amhello',
52	54	'/usr/share/doc/amhello/README'])
53	55
54	56

tests/integration/autotools.py

---

...	...	@@ -31,8 +31,10 @@ def test_autotools_build(cli, tmpdir, datafiles):
31	31
32	32	assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
33	33	'/usr/share', '/usr/lib/debug',
34		- '/usr/lib/debug/hello', '/usr/bin/hello',
35		- '/usr/share/doc', '/usr/share/doc/amhello',
	34	+ '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
	35	+ '/usr/lib/debug/usr/bin/hello',
	36	+ '/usr/bin/hello', '/usr/share/doc',
	37	+ '/usr/share/doc/amhello',
36	38	'/usr/share/doc/amhello/README'])
37	39
38	40

tests/integration/cmake.py

---

...	...	@@ -27,7 +27,9 @@ def test_cmake_build(cli, tmpdir, datafiles):
27	27	assert result.exit_code == 0
28	28
29	29	assert_contains(checkout, ['/usr', '/usr/bin', '/usr/bin/hello',
30		- '/usr/lib/debug', '/usr/lib/debug/hello'])
	30	+ '/usr/lib/debug', '/usr/lib/debug/usr',
	31	+ '/usr/lib/debug/usr/bin',
	32	+ '/usr/lib/debug/usr/bin/hello'])
31	33
32	34
33	35	@pytest.mark.datafiles(DATA_DIR)

tests/integration/compose.py

---

...	...	@@ -39,7 +39,8 @@ def create_compose_element(name, path, config={}):
39	39	# Test flat inclusion
40	40	([], [], ['/usr', '/usr/lib', '/usr/bin',
41	41	'/usr/share', '/usr/lib/debug',
42		- '/usr/lib/debug/hello', '/usr/bin/hello',
	42	+ '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
	43	+ '/usr/lib/debug/usr/bin/hello', '/usr/bin/hello',
43	44	'/usr/share/doc', '/usr/share/doc/amhello',
44	45	'/usr/share/doc/amhello/README',
45	46	'/tests', '/tests/test']),
...	...	@@ -53,13 +54,17 @@ def create_compose_element(name, path, config={}):
53	54	'/usr/share/doc/amhello/README']),
54	55	# Test with only runtime excluded
55	56	([], ['runtime'], ['/usr', '/usr/lib', '/usr/share',
56		- '/usr/lib/debug', '/usr/lib/debug/hello',
	57	+ '/usr/lib/debug', '/usr/lib/debug/usr',
	58	+ '/usr/lib/debug/usr/bin',
	59	+ '/usr/lib/debug/usr/bin/hello',
57	60	'/usr/share/doc', '/usr/share/doc/amhello',
58	61	'/usr/share/doc/amhello/README',
59	62	'/tests', '/tests/test']),
60	63	# Test with runtime and doc excluded
61	64	([], ['runtime', 'doc'], ['/usr', '/usr/lib', '/usr/share',
62		- '/usr/lib/debug', '/usr/lib/debug/hello',
	65	+ '/usr/lib/debug', '/usr/lib/debug/usr',
	66	+ '/usr/lib/debug/usr/bin',
	67	+ '/usr/lib/debug/usr/bin/hello',
63	68	'/tests', '/tests/test']),
64	69	# Test with runtime simultaneously in- and excluded
65	70	(['runtime'], ['runtime'], ['/usr', '/usr/lib', '/usr/share']),
...	...	@@ -72,7 +77,8 @@ def create_compose_element(name, path, config={}):
72	77	# Test excluding a custom 'test' domain
73	78	([], ['test'], ['/usr', '/usr/lib', '/usr/bin',
74	79	'/usr/share', '/usr/lib/debug',
75		- '/usr/lib/debug/hello', '/usr/bin/hello',
	80	+ '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',
	81	+ '/usr/lib/debug/usr/bin/hello', '/usr/bin/hello',
76	82	'/usr/share/doc', '/usr/share/doc/amhello',
77	83	'/usr/share/doc/amhello/README'])
78	84	])

—
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.