# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 2016-03-14 15:14:53
# Node ID dfd5a6830ea7cd56909b6667c78ae122cc3a5aa1
# Parent  ed75909c4c670a7d9db4a2bef9817a0d5f0b4d9c

tests: make tests for convert with svn portable

svn 1.6.x (at least, 1.6.12 or 1.6.17) might display empty lines, even
though svn 1.9.x (at least, 1.9.3) doesn't.

To make tests for convert with svn portable, this patch adds "|(^$)"
regexp to egrep in filter_svn_output.

To avoid similar future issue, this patch adds "|(^$)" regexp to all
filter_svn_output (and adjusts test-subrepo-svn.t), even though only
test-convert-svn-source.t fails with svn 1.6.x, AFAIK.

diff --git a/tests/test-convert-hg-svn.t b/tests/test-convert-hg-svn.t
--- a/tests/test-convert-hg-svn.t
+++ b/tests/test-convert-hg-svn.t
@@ -1,7 +1,7 @@
 #require svn svn-bindings
 
   $ filter_svn_output () {
-  >     egrep -v 'Committing|Updating' | sed -e 's/done$//' || true
+  >     egrep -v 'Committing|Updating|(^$)' | sed -e 's/done$//' || true
   > }
 
   $ cat <<EOF >> $HGRCPATH
diff --git a/tests/test-convert-svn-source.t b/tests/test-convert-svn-source.t
--- a/tests/test-convert-svn-source.t
+++ b/tests/test-convert-svn-source.t
@@ -1,7 +1,7 @@
 #require svn svn-bindings
 
   $ filter_svn_output () {
-  >     egrep -v 'Committing|Updating' | sed -e 's/done$//' || true
+  >     egrep -v 'Committing|Updating|(^$)' | sed -e 's/done$//' || true
   > }
 
   $ cat >> $HGRCPATH <<EOF
diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t
--- a/tests/test-subrepo-svn.t
+++ b/tests/test-subrepo-svn.t
@@ -8,7 +8,7 @@
 #endif
 
   $ filter_svn_output () {
-  >     egrep -v 'Committing|Transmitting|Updating' || true
+  >     egrep -v 'Committing|Transmitting|Updating|(^$)' || true
   > }
 
 create subversion repo
@@ -97,10 +97,8 @@ change file in svn and hg, commit
   committing subrepository s
   Sending*s/alpha (glob)
   Committed revision 3.
-  
   Fetching external item into '*s/externals'* (glob)
   External at revision 1.
-  
   At revision 3.
   $ hg debugsub
   path s