svn commit: r1558947 - /subversion/trunk/subversion/tests/libsvn_client/client-test.c

[br...@apache.org]

Author: breser
Date: Thu Jan 16 22:56:02 2014
New Revision: 1558947

URL: http://svn.apache.org/r1558947
Log:
Rename variable to be consistent with other tests.  No functional change.

* subversion/tests/libsvn_client/client-test.c
  (test_suggest_mergesources): s/wc_dir/wc_path/

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

Modified: subversion/trunk/subversion/tests/libsvn_client/client-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/client-test.c?rev=1558947&r1=1558946&r2=1558947&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/client-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/client-test.c Thu Jan 16 22:56:02 2014
@@ -779,7 +779,7 @@ test_suggest_mergesources(const svn_test
   apr_array_header_t *results;
   svn_opt_revision_t peg_rev;
   svn_opt_revision_t head_rev;
-  const char *wc_dir;
+  const char *wc_path;
 
   peg_rev.kind = svn_opt_revision_unspecified;
 
@@ -802,20 +802,20 @@ test_suggest_mergesources(const svn_test
                           svn_path_url_add_component2(repos_url, "A", pool));
 
   /* And now test the same thing with a minimal working copy */
-  wc_dir = svn_test_data_path("mergesources-wc", pool);
-  svn_test_add_dir_cleanup(wc_dir);
-  SVN_ERR(svn_io_remove_dir2(wc_dir, TRUE, NULL, NULL, pool));
+  wc_path = svn_test_data_path("mergesources-wc", pool);
+  svn_test_add_dir_cleanup(wc_path);
+  SVN_ERR(svn_io_remove_dir2(wc_path, TRUE, NULL, NULL, pool));
 
   head_rev.kind = svn_opt_revision_head;
   SVN_ERR(svn_client_checkout3(NULL,
                                svn_path_url_add_component2(repos_url, "AA", pool),
-                               wc_dir,
+                               wc_path,
                                &head_rev, &head_rev, svn_depth_empty,
                                FALSE, FALSE, ctx, pool));
 
 
   SVN_ERR(svn_client_suggest_merge_sources(&results,
-                                           wc_dir,
+                                           wc_path,
                                            &peg_rev, ctx, pool));
   SVN_TEST_ASSERT(results != NULL);
   SVN_TEST_ASSERT(results->nelts >= 1);