From 7515ab13768c7edc09f0f2ec2354dc6c928239a6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 23 Nov 2016 18:01:18 -0500 Subject: [PATCH] microdump_stackwalk_test: fix bashism in test These are /bin/sh scripts, and `source` is a bash-specific command. Switch to the portable `.` command instead. Change-Id: I51d8253b26aa61c130bb5fdc4789f8d623c6d9db Reviewed-on: https://chromium-review.googlesource.com/414524 Reviewed-by: Primiano Tucci --- Makefile.am | 1 + Makefile.in | 1 + src/processor/microdump_stackwalk_machine_readable_test | 2 +- src/processor/microdump_stackwalk_test | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 51d19fba..ad4e6180 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1332,6 +1332,7 @@ EXTRA_DIST = \ src/common/windows/pdb_source_line_writer.h \ src/common/windows/string_utils-inl.h \ src/common/windows/string_utils.cc \ + src/processor/microdump_stackwalk_test_vars \ src/processor/stackwalk_common.cc \ src/processor/stackwalk_common.h \ src/processor/stackwalker_selftest_sol.s \ diff --git a/Makefile.in b/Makefile.in index 6a5e56b0..c728e593 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3183,6 +3183,7 @@ EXTRA_DIST = \ src/common/windows/pdb_source_line_writer.h \ src/common/windows/string_utils-inl.h \ src/common/windows/string_utils.cc \ + src/processor/microdump_stackwalk_test_vars \ src/processor/stackwalk_common.cc \ src/processor/stackwalk_common.h \ src/processor/stackwalker_selftest_sol.s \ diff --git a/src/processor/microdump_stackwalk_machine_readable_test b/src/processor/microdump_stackwalk_machine_readable_test index fadec264..f5614e20 100755 --- a/src/processor/microdump_stackwalk_machine_readable_test +++ b/src/processor/microdump_stackwalk_machine_readable_test @@ -29,7 +29,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -source "${0%/*}/microdump_stackwalk_test_vars" # for MICRODUMP_SUPPORTED_ARCHS. +. "${0%/*}/microdump_stackwalk_test_vars" || exit 1 # for MICRODUMP_SUPPORTED_ARCHS. testdata_dir=$srcdir/src/processor/testdata set -e # Bail out with an error if any of the commands below fails. diff --git a/src/processor/microdump_stackwalk_test b/src/processor/microdump_stackwalk_test index 5a1f3d59..e1897656 100755 --- a/src/processor/microdump_stackwalk_test +++ b/src/processor/microdump_stackwalk_test @@ -29,7 +29,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -source "${0%/*}/microdump_stackwalk_test_vars" # for MICRODUMP_SUPPORTED_ARCHS. +. "${0%/*}/microdump_stackwalk_test_vars" || exit 1 # for MICRODUMP_SUPPORTED_ARCHS. testdata_dir=$srcdir/src/processor/testdata set -e # Bail out with an error if any of the commands below fails.