error() will only output the file name, but with ".exe" on windows.
Signed-off-by: Ulf Hermann <ulf.herm...@qt.io> --- tests/ChangeLog | 6 ++++++ tests/run-stack-d-test.sh | 5 +++++ tests/run-stack-demangled-test.sh | 5 +++++ tests/run-stack-i-test.sh | 5 +++++ 4 files changed, 21 insertions(+) diff --git a/tests/ChangeLog b/tests/ChangeLog index 9c04404..f43aeba 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,11 @@ 2017-05-04 Ulf Hermann <ulf.herm...@qt.io> + * run-stack-d-test.sh: Correctly detect STACKCMD on windows. + * run-stack-demangled-test.sh: Likewise. + * run-stack-i-test.sh: Likewise. + +2017-05-04 Ulf Hermann <ulf.herm...@qt.io> + * elfstrmerge.c: Use 07777 instead of ALLPERMS. 2017-05-04 Ulf Hermann <ulf.herm...@qt.io> diff --git a/tests/run-stack-d-test.sh b/tests/run-stack-d-test.sh index a9f0380..ef3c6e8 100755 --- a/tests/run-stack-d-test.sh +++ b/tests/run-stack-d-test.sh @@ -64,6 +64,11 @@ testfiles testfiledwarfinlines testfiledwarfinlines.core # the error message, which we also try to match. if test "$elfutils_testrun" = "installed"; then STACKCMD=${bindir}/`program_transform stack` +if test -f ${STACKCMD}.exe; then +STACKCMD=`program_transform stack`.exe +fi +elif test -f ${abs_top_builddir}/src/stack.exe; then +STACKCMD=stack.exe else STACKCMD=${abs_top_builddir}/src/stack fi diff --git a/tests/run-stack-demangled-test.sh b/tests/run-stack-demangled-test.sh index c26918f..f6899bb 100755 --- a/tests/run-stack-demangled-test.sh +++ b/tests/run-stack-demangled-test.sh @@ -33,6 +33,11 @@ testfiles testfiledwarfinlines testfiledwarfinlines.core # the error message, which we also try to match. if test "$elfutils_testrun" = "installed"; then STACKCMD=${bindir}/`program_transform stack` +if test -f ${STACKCMD}.exe; then +STACKCMD=`program_transform stack`.exe +fi +elif test -f ${abs_top_builddir}/src/stack.exe; then +STACKCMD=stack.exe else STACKCMD=${abs_top_builddir}/src/stack fi diff --git a/tests/run-stack-i-test.sh b/tests/run-stack-i-test.sh index 3722ab0..a09e46d 100755 --- a/tests/run-stack-i-test.sh +++ b/tests/run-stack-i-test.sh @@ -25,6 +25,11 @@ testfiles testfiledwarfinlines testfiledwarfinlines.core # the error message, which we also try to match. if test "$elfutils_testrun" = "installed"; then STACKCMD=${bindir}/`program_transform stack` +if test -f ${STACKCMD}.exe; then +STACKCMD=`program_transform stack`.exe +fi +elif test -f ${abs_top_builddir}/src/stack.exe; then +STACKCMD=stack.exe else STACKCMD=${abs_top_builddir}/src/stack fi -- 2.1.4