Mirror of the lttng-dev mailing list
 help / color / mirror / Atom feed
From: mjeanson@efficios.com (Michael Jeanson)
Subject: [lttng-dev] [PATCH babeltrace] Port: do not depend on GNU readlink
Date: Tue, 19 Sep 2017 16:26:30 -0400	[thread overview]
Message-ID: <1505852790-23336-1-git-send-email-mjeanson@efficios.com> (raw)

Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
---
 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 4502d44..abb0575 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 24bea07..4bcf2bf 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 85b51dd..beb6f0a 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 09ab708..0069dd7 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 a0ae51b..0a99e7d 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.7.4



                 reply	other threads:[~2017-09-19 20:26 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1505852790-23336-1-git-send-email-mjeanson@efficios.com \
    --to=mjeanson@efficios.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox