[commit: ghc] master: Portability: wc -l sometimes has leading spaces, trim them off. (9a1779e)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9a1779ebf92c8ae30ff5b00e51b87bc42c4000b6/ghc

>---------------------------------------------------------------

commit 9a1779ebf92c8ae30ff5b00e51b87bc42c4000b6
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Fri Dec 5 15:50:53 2014 -0800

    Portability: wc -l sometimes has leading spaces, trim them off.
    
    Summary: Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: austin
    
    Subscribers: carter, thomie
    
    Differential Revision: https://phabricator.haskell.org/D557


>---------------------------------------------------------------

9a1779ebf92c8ae30ff5b00e51b87bc42c4000b6
 testsuite/tests/cabal/cabal06/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testsuite/tests/cabal/cabal06/Makefile b/testsuite/tests/cabal/cabal06/Makefile
index 5934b9b..8b918a0 100644
--- a/testsuite/tests/cabal/cabal06/Makefile
+++ b/testsuite/tests/cabal/cabal06/Makefile
@@ -46,9 +46,9 @@ cabal06: clean
 	cd q && $(SETUP) copy
 	(cd q && $(SETUP) register --print-ipid) > tmp_second_q
 	@echo "Does the first instance of q depend on p-1.0?"
-	'$(GHC_PKG)' field --ipid `cat tmp_first_q` depends -f tmp.d | grep p-1.0 | wc -l
+	'$(GHC_PKG)' field --ipid `cat tmp_first_q` depends -f tmp.d | grep p-1.0 | wc -l | sed 's/[[:space:]]//g'
 	@echo "Does the second instance of q depend on p-1.0?"
-	'$(GHC_PKG)' field --ipid `cat tmp_second_q` depends -f tmp.d | grep p-1.1 | wc -l
+	'$(GHC_PKG)' field --ipid `cat tmp_second_q` depends -f tmp.d | grep p-1.1 | wc -l | sed 's/[[:space:]]//g'
 	cd r && $(SETUP) clean
 	cd r && ../Setup configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --dependency="q=`cat ../tmp_first_q`" --constraint="p==1.0" --prefix='$(PWD)/inst-e' --ghc-pkg-options='--enable-multi-instance'
 	cd r && $(SETUP) build