Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
642
Issues
642
List
Boards
Labels
Service Desk
Milestones
Merge Requests
194
Merge Requests
194
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
f699d4f9
Commit
f699d4f9
authored
Oct 04, 2018
by
Luca Weiss
Committed by
Natanael Copa
May 31, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testing/lttng-tools: upgrade to 2.10.6
parent
baa1921e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
60 deletions
+45
-60
testing/lttng-tools/9193db67743d08f418235fee43747bb9d42d62ce.patch
...ttng-tools/9193db67743d08f418235fee43747bb9d42d62ce.patch
+29
-0
testing/lttng-tools/APKBUILD
testing/lttng-tools/APKBUILD
+16
-11
testing/lttng-tools/musl-has-no-dlmopen.patch
testing/lttng-tools/musl-has-no-dlmopen.patch
+0
-49
No files found.
testing/lttng-tools/9193db67743d08f418235fee43747bb9d42d62ce.patch
0 → 100644
View file @
f699d4f9
From 9193db67743d08f418235fee43747bb9d42d62ce Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 15 Mar 2019 11:19:27 -0400
Subject: [PATCH] fix: tests: link libpause_consumer on liblttng-ctl
This preload test library uses symbols from liblttng-ctl which are
resolved when preloaded by GLIBC but not by MUSL.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
tests/regression/tools/notification/Makefile.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am
index 33e95886d..b869bdb1d 100644
--- a/tests/regression/tools/notification/Makefile.am
+++ b/tests/regression/tools/notification/Makefile.am
@@ -20,7 +20,10 @@
FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \
-rpath $(abs_builddir)
libpause_consumer_la_SOURCES = consumer_testpoints.c
-libpause_consumer_la_LIBADD = $(top_builddir)/src/common/libcommon.la $(DL_LIBS)
+libpause_consumer_la_LIBADD = \
+ $(top_builddir)/src/common/libcommon.la \
+ $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
+ $(DL_LIBS)
libpause_consumer_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS)
noinst_LTLIBRARIES = libpause_consumer.la
testing/lttng-tools/APKBUILD
View file @
f699d4f9
# Contributor: Michael Jeanson <mjeanson@efficios.com>
# Maintainer: Michael Jeanson <mjeanson@efficios.com>
pkgname
=
lttng-tools
pkgver
=
2.
9
.6
pkgver
=
2.
10
.6
pkgrel
=
0
pkgdesc
=
"LTTng 2.0 control and utility programs"
url
=
"https://lttng.org"
...
...
@@ -10,37 +10,42 @@ license="GPL-2.0"
depends
=
"babeltrace"
depends_dev
=
"popt-dev libxml2-dev userspace-rcu-dev lttng-ust-dev kmod-dev
util-linux-dev"
makedepends
=
"
$depends_dev
bash grep coreutils automake autoconf"
makedepends
=
"
$depends_dev
bash grep coreutils automake autoconf libtool"
checkdepends
=
"util-linux"
install
=
""
subpackages
=
"
$pkgname
-dev
$pkgname
-doc"
source
=
"https://lttng.org/files/
$pkgname
/
$pkgname
-
$pkgver
.tar.bz2
musl-has-no-dlmopen.patch"
9193db67743d08f418235fee43747bb9d42d62ce.patch"
builddir
=
"
$srcdir
/
$pkgname
-
$pkgver
"
build
()
{
cd
"
$builddir
"
unset
LDFLAGS
# We patch Makefile.am
autoreconf
-fi
./configure
\
--build
=
$CBUILD
\
--host
=
$CHOST
\
--prefix
=
/usr
\
--sysconfdir
=
/etc
\
--localstatedir
=
/var
\
||
return
1
make
V
=
1
||
return
1
make
-j1
check
||
return
1
--localstatedir
=
/var
make
V
=
1
}
check
()
{
cd
"
$builddir
"
make
-j1
check
}
package
()
{
cd
"
$builddir
"
make
DESTDIR
=
"
$pkgdir
"
install
||
return
1
make
DESTDIR
=
"
$pkgdir
"
install
mkdir
-p
"
$pkgdir
"
/usr/share/licenses/
$pkgname
mv
"
$pkgdir
"
/usr/share/doc/
$pkgname
/LICENSE
\
"
$pkgdir
"
/usr/share/licenses/
$pkgname
/
}
sha512sums
=
"
5fc9da4280587c4dc3c695f713e3ae51ad46a9bd0c82d4241a95f406e2644ef296d46c507171b7adc549a933f3abc64c993106287a84a0b8c6901b3b122a0646 lttng-tools-2.9
.6.tar.bz2
cb5136007b0d8ea0a84557ab025e709dc4c5d818272f057a9f6c78ed7cf5104b9d904a1b8c5e8674e3455fe85dc28bb890c190cc04f0c1d9c29d87b40dadb88b musl-has-no-dlmopen
.patch"
sha512sums
=
"
d33379687755b1c97036d69abcf778278adc099e8c44f94b1f1c610011bf8f0da66a2743f39cb9798c72a2e6218bb31c4d392ff4269dbf0d6a694294458f231d lttng-tools-2.10
.6.tar.bz2
63fa29f2f6ee7065cc8c44663428ecf2b8c1d4557214e6aa04a863168f73bbe532f2ee7d55fc23a30fda1ab03c4434b857f3778a7807eba573e01959b2288ac9 9193db67743d08f418235fee43747bb9d42d62ce
.patch"
testing/lttng-tools/musl-has-no-dlmopen.patch
deleted
100644 → 0
View file @
baa1921e
--- lttng-tools-2.9.0.orig/tests/regression/ust/ust-dl/prog.c
+++ lttng-tools-2.9.0/tests/regression/ust/ust-dl/prog.c
@@ -21,7 +21,7 @@
if (!h0) {
goto get_error;
}
- h1 = dlmopen(LM_ID_BASE, "libfoo.so", RTLD_LAZY);
+ h1 = dlopen("libfoo.so", RTLD_LAZY);
if (!h1) {
goto get_error;
}
--- lttng-tools-2.9.0.orig/tests/regression/ust/ust-dl/test_ust-dl.py
+++ lttng-tools-2.9.0/tests/regression/ust/ust-dl/test_ust-dl.py
@@ -31,7 +31,7 @@
from test_utils import *
-NR_TESTS = 14
+NR_TESTS = 13
current_test = 1
print("1..{0}".format(NR_TESTS))
@@ -65,7 +65,6 @@
bail("Could not open babeltrace. Please make sure it is installed.", session_info)
dlopen_event_found = 0
-dlmopen_event_found = 0
build_id_event_found = 0
debug_link_event_found = 0
dlclose_event_found = 0
@@ -82,8 +81,6 @@
event_line = event_line.decode('utf-8').replace("\n", "")
if re.search(r".*lttng_ust_dl:dlopen.*", event_line) is not None:
dlopen_event_found += 1
- elif re.search(r".*lttng_ust_dl:dlmopen.*", event_line) is not None:
- dlmopen_event_found += 1
elif re.search(r".*lttng_ust_dl:build_id.*", event_line) is not None:
build_id_event_found += 1
elif re.search(r".*lttng_ust_dl:debug_link.*", event_line) is not None:
@@ -111,9 +108,6 @@
current_test += 1
print_test_result(dlopen_event_found > 0, current_test, "lttng_ust_dl:dlopen event found in resulting trace")
-current_test += 1
-
-print_test_result(dlmopen_event_found > 0, current_test, "lttng_ust_dl:dlmopen event found in resulting trace")
current_test += 1
print_test_result(build_id_event_found > 0, current_test, "lttng_ust_dl:build_id event found in resulting trace")
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment