diff options
| author | Michael Jeanson <mjeanson@efficios.com> | 2016-12-02 16:25:53 -0500 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-12-07 08:47:57 +0000 |
| commit | 881eab873d124ea3c2d66bb25875d3c5e275e8f3 (patch) | |
| tree | e9cd181f791552deaabb60f35f3b0814ac3dc2f8 /testing/lttng-tools/musl-has-no-dlmopen.patch | |
| parent | cb13a5abe28833d6c2a776354ded3e4c8fbd344a (diff) | |
| download | aports-881eab873d124ea3c2d66bb25875d3c5e275e8f3.tar.bz2 aports-881eab873d124ea3c2d66bb25875d3c5e275e8f3.tar.xz | |
testing/lttng-tools: upgrade to 2.9.0
Diffstat (limited to 'testing/lttng-tools/musl-has-no-dlmopen.patch')
| -rw-r--r-- | testing/lttng-tools/musl-has-no-dlmopen.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/testing/lttng-tools/musl-has-no-dlmopen.patch b/testing/lttng-tools/musl-has-no-dlmopen.patch new file mode 100644 index 0000000000..e5f4806373 --- /dev/null +++ b/testing/lttng-tools/musl-has-no-dlmopen.patch @@ -0,0 +1,49 @@ +--- 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") |