subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1839698 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Date Thu, 30 Aug 2018 21:04:27 GMT
Author: rhuijben
Date: Thu Aug 30 21:04:27 2018
New Revision: 1839698

URL: http://svn.apache.org/viewvc?rev=1839698&view=rev
Log:
Fix expected testresult of conflicts test that hits eol-style
differences on Windows.

* subversion/tests/libsvn_client/conflicts-test.c
  (test_cherry_pick_post_move_edit): Use strict "\n" in quite a few
    places to unbreak test.

Modified:
    subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c

Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1839698&r1=1839697&r2=1839698&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Thu Aug 30 21:04:27 2018
@@ -5019,14 +5019,15 @@ test_cherry_pick_post_move_edit(const sv
 
   /* And "A1/mu" should have expected contents. */
   SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A1/mu"), pool));
+  //DebugBreak();
   SVN_TEST_STRING_ASSERT(buf->data, 
-    "<<<<<<< .working" APR_EOL_STR
-    "This is the file 'mu'." APR_EOL_STR
-    "||||||| .old" APR_EOL_STR
+    "<<<<<<< .working" "\n"
+    "This is the file 'mu'." "\n"
+    "||||||| .old" "\n"
     "Modified content." APR_EOL_STR
-    "=======" APR_EOL_STR
+    "=======" "\n"
     "More modified content." APR_EOL_STR
-    ">>>>>>> .new" APR_EOL_STR);
+    ">>>>>>> .new" "\n");
 
   return SVN_NO_ERROR;
 }



Mime
View raw message