From 30aa7991311e22f3d836f127db622c215ed53d6b Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 19 Sep 2017 16:26:30 -0400 Subject: [PATCH] Port: do not depend on GNU readlink MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- tests/lib/test_ctf_writer_complete.in | 3 +-- tests/lib/test_plugin_complete.in | 3 +-- tests/plugins/test-utils-muxer-complete.in | 3 +-- tests/plugins/test_bin_info_complete.in | 3 +-- tests/plugins/test_dwarf_complete.in | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/tests/lib/test_ctf_writer_complete.in b/tests/lib/test_ctf_writer_complete.in index 4502d444..abb05758 100644 --- a/tests/lib/test_ctf_writer_complete.in +++ b/tests/lib/test_ctf_writer_complete.in @@ -20,7 +20,6 @@ NO_SH_TAP=1 . "@abs_top_builddir@/tests/utils/common.sh" -script="$(readlink -f "$0")" -curdir="$(dirname "$script")" +curdir="$(cd -P "$(dirname "$0")" >/dev/null && pwd)" "${curdir}/test_ctf_writer" "$BT_BIN" diff --git a/tests/lib/test_plugin_complete.in b/tests/lib/test_plugin_complete.in index 24bea07c..4bcf2bf5 100644 --- a/tests/lib/test_plugin_complete.in +++ b/tests/lib/test_plugin_complete.in @@ -20,8 +20,7 @@ NO_SH_TAP=1 . "@abs_top_builddir@/tests/utils/common.sh" -script="$(readlink -f "$0")" -curdir="$(dirname "$script")" +curdir="$(cd -P "$(dirname "$0")" >/dev/null && pwd)" plugin_dir="${curdir}/test-plugin-plugins/.libs" diff --git a/tests/plugins/test-utils-muxer-complete.in b/tests/plugins/test-utils-muxer-complete.in index 85b51dd5..beb6f0a2 100644 --- a/tests/plugins/test-utils-muxer-complete.in +++ b/tests/plugins/test-utils-muxer-complete.in @@ -20,8 +20,7 @@ NO_SH_TAP=1 . "@abs_top_builddir@/tests/utils/common.sh" -script="$(readlink -f "$0")" -curdir="$(dirname "$script")" +curdir="$(cd -P "$(dirname "$0")" >/dev/null && pwd)" plugin_dir="${BT_BUILD_PATH}/plugins/utils" diff --git a/tests/plugins/test_bin_info_complete.in b/tests/plugins/test_bin_info_complete.in index 09ab708e..0069dd7e 100644 --- a/tests/plugins/test_bin_info_complete.in +++ b/tests/plugins/test_bin_info_complete.in @@ -20,8 +20,7 @@ NO_SH_TAP=1 . "@abs_top_builddir@/tests/utils/common.sh" -script="$(readlink -f "$0")" -curdir="$(dirname "$script")" +curdir="$(cd -P "$(dirname "$0")" >/dev/null && pwd)" debug_info_data="${BT_SRC_PATH}/tests/debug-info-data" diff --git a/tests/plugins/test_dwarf_complete.in b/tests/plugins/test_dwarf_complete.in index a0ae51b5..0a99e7d9 100644 --- a/tests/plugins/test_dwarf_complete.in +++ b/tests/plugins/test_dwarf_complete.in @@ -20,8 +20,7 @@ NO_SH_TAP=1 . "@abs_top_builddir@/tests/utils/common.sh" -script="$(readlink -f "$0")" -curdir="$(dirname "$script")" +curdir="$(cd -P "$(dirname "$0")" >/dev/null && pwd)" debug_info_data="${BT_SRC_PATH}/tests/debug-info-data" -- 2.34.1