From 74cf9bdda693e4c7b9443dea6a30d52f55f16517 Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Fri, 22 Jan 2010 20:00:47 +0000 Subject: [PATCH] engine.pl: Fix a recent breakage of the buildsystem generator Commit ade2ca0c (Do not try to remove directories when removing old links, 2009-10-27) added an expression to a 'test' using an '-o' or connective. This resulted in the buildsystem generator mistaking a conditional 'rm' for a linker command. In order to fix the breakage, we filter out all 'test' commands before then attempting to identify the commands of interest. Signed-off-by: Ramsay Jones Acked-by: Sebastian Schuberth Signed-off-by: Junio C Hamano --- contrib/buildsystems/engine.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index d506717bfd..8f890fb5a5 100644 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -135,6 +135,11 @@ sub parseMakeOutput } } while($ate_next); + if ($text =~ /^test /) { + # options to test (eg -o) may be mistaken for linker options + next; + } + if($text =~ / -c /) { # compilation handleCompileLine($text, $line); @@ -180,9 +185,6 @@ sub parseMakeOutput # } elsif ($text =~ /generate-cmdlist\.sh/) { # # command for generating list of commands # -# } elsif ($text =~ /^test / && $text =~ /|| rm -f /) { -# # commands removing executables, if they exist -# # } elsif ($text =~ /new locations or Tcl/) { # # command for detecting Tcl/Tk changes # -- 2.11.4.GIT