From 27e2c58dac59aaf634817f52a89870107e7e3e01 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Wed, 3 Jul 2019 17:02:59 -0400 Subject: [PATCH] tests: Add ".exe" when running on a mingw system libtool wrapper fail to resolve executable without ".exe" suffix on mingw system. tests/ctf-writer/test_ctf_writer: babeltrace2:./.libs/lt-babeltrace2.c:237: FATAL: couldn't find ./../utils/../../src/cli/babeltrace2. not ok 325 - Babeltrace could read the resulting trace Change-Id: I4e916077925b34745e6b70d14d86e263427d081e Signed-off-by: Jonathan Rajotte Reviewed-on: https://review.lttng.org/c/babeltrace/+/1611 Reviewed-by: Philippe Proulx Reviewed-by: Michael Jeanson --- tests/utils/utils.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 4add2afa..b1b6366a 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -45,11 +45,17 @@ fi # Allow overriding the babeltrace2 executables if [ "x${BT_TESTS_BT2_BIN:-}" = "x" ]; then BT_TESTS_BT2_BIN="$BT_TESTS_BUILDDIR/../src/cli/babeltrace2" + if [ "x${MSYSTEM:-}" != "x" ]; then + BT_TESTS_BT2_BIN="${BT_TESTS_BT2_BIN}.exe" + fi fi export BT_TESTS_BT2_BIN if [ "x${BT_TESTS_BT2LOG_BIN:-}" = "x" ]; then BT_TESTS_BT2LOG_BIN="$BT_TESTS_BUILDDIR/../src/cli/babeltrace2-log" + if [ "x${MSYSTEM:-}" != "x" ]; then + BT_TESTS_BT2LOG_BIN="${BT_TESTS_BT2LOG_BIN}.exe" + fi fi export BT_TESTS_BT2LOG_BIN -- 2.34.1