From 96f2b96726cf7049e4026f51df52d352809b32a6 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Tue, 3 May 2011 00:27:07 +0200 Subject: [PATCH] tests: fix spurious failure in 'color2.test' * tests/color2.test: If $MAKE contains command-line arguments (as in e.g., "make -j2"), expect's directive "spawn $env(MAKE)" fails spuriously, because it tries to run "$MAKE" as a single command. Fix this with proper uses of the TCL `eval' builtin. --- ChangeLog | 8 ++++++++ tests/color2.test | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 046ecffc6..a5354c135 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-05-03 Stefano Lattarini + + tests: fix spurious failure in 'color2.test' + * tests/color2.test: If $MAKE contains command-line arguments (as + in e.g., "make -j2"), expect's directive "spawn $env(MAKE)" fails + spuriously, because it tries to run "$MAKE" as a single command. + Fix this with proper uses of the TCL `eval' builtin. + 2011-05-01 Stefano Lattarini tests: fix self check spurious failure with older bash versions diff --git a/tests/color2.test b/tests/color2.test index c3315deb4..eb9c52788 100755 --- a/tests/color2.test +++ b/tests/color2.test @@ -39,7 +39,7 @@ esac # Check that we have a working expect program. cat >expect-check <<'END' #! /usr/bin/expect -f -spawn $env(THE_SYSTEM_SHELL) -c : +eval spawn $env(THE_SYSTEM_SHELL) -c : expect eof END THE_SYSTEM_SHELL=/bin/sh expect -f expect-check || { @@ -107,7 +107,7 @@ test_no_color () cat >expect-make <<'END' #! /usr/bin/expect -f -spawn $env(MAKE) -e check +eval spawn $env(MAKE) -e check expect eof END -- 2.47.3