Author: danielsh
Date: Sun Oct 31 04:06:09 2010
New Revision: 1029240
URL: http://svn.apache.org/viewvc?rev=1029240&view=rev
Log:
Avoid dragging libsvn_client as a dependency to libsvn_test, because that makes
every C test file depend on every C library source file. Instead, the two
source files that use the shared subroutine svn_test__create_repos_and_wc() now
explicitly list the source file containing that function in build.conf.
* build.conf
(libsvn_test): Remove dependency on libsvn_client.
(pristine-store-test, op-depth-test): Add utils.c as a source file.
* subversion/tests/libsvn_wc/utils.c: Renamed from...
* subversion/tests/svn_test_utils.c: ... here.
* subversion/tests/libsvn_wc/utils.h: Renamed from...
* subversion/tests/svn_test_utils.h: ... here.
* subversion/tests/libsvn_wc/pristine-store-test.c,
subversion/tests/libsvn_wc/op-depth-test.c:
(utils.h, svn_test_utils.h): Track rename in #include's.
Added:
subversion/trunk/subversion/tests/libsvn_wc/utils.c
- copied, changed from r1029227,
subversion/trunk/subversion/tests/svn_test_utils.c
subversion/trunk/subversion/tests/libsvn_wc/utils.h
- copied, changed from r1029227,
subversion/trunk/subversion/tests/svn_test_utils.h
Removed:
subversion/trunk/subversion/tests/svn_test_utils.c
subversion/trunk/subversion/tests/svn_test_utils.h
Modified:
subversion/trunk/build.conf
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c
Modified: subversion/trunk/build.conf
URL:
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1029240&r1=1029239&r2=1029240&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Sun Oct 31 04:06:09 2010
@@ -614,7 +614,7 @@ link-cmd = $(LINK_JAVAHL_CXX)
type = lib
path = subversion/tests
install = test
-libs = libsvn_client libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil
apriconv apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr aprutil apriconv apr
msvc-static = yes
undefined-lib-symbols = yes
@@ -945,7 +945,7 @@ libs = libsvn_test libsvn_wc libsvn_subr
description = Test the wc-ng pristine text storage subsystem
type = exe
path = subversion/tests/libsvn_wc
-sources = pristine-store-test.c
+sources = pristine-store-test.c utils.c
install = test
libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
@@ -961,7 +961,7 @@ libs = libsvn_test libsvn_wc libsvn_subr
description = Test the main WC API functions
type = exe
path = subversion/tests/libsvn_wc
-sources = op-depth-test.c
+sources = op-depth-test.c utils.c
install = test
libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1029240&r1=1029239&r2=1029240&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Sun Oct 31
04:06:09 2010
@@ -33,11 +33,12 @@
#include "svn_client.h"
#include "svn_hash.h"
+#include "utils.h"
+
#include "private/svn_wc_private.h"
#include "private/svn_sqlite.h"
#include "../svn_test.h"
-#include "../svn_test_utils.h"
/* Compare strings, like strcmp but either or both may be NULL which
Modified: subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c?rev=1029240&r1=1029239&r2=1029240&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c Sun Oct
31 04:06:09 2010
@@ -40,6 +40,8 @@
#include "svn_wc.h"
#include "svn_client.h"
+#include "utils.h"
+
#include "../../libsvn_wc/wc.h"
#include "../../libsvn_wc/wc_db.h"
#include "../../libsvn_wc/wc-queries.h"
@@ -48,7 +50,6 @@
#include "private/svn_wc_private.h"
#include "../svn_test.h"
-#include "../svn_test_utils.h"
/* Create repos and WC, and also set *DB to a new DB context. */
Copied: subversion/trunk/subversion/tests/libsvn_wc/utils.c (from r1029227,
subversion/trunk/subversion/tests/svn_test_utils.c)
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/utils.c?p2=subversion/trunk/subversion/tests/libsvn_wc/utils.c&p1=subversion/trunk/subversion/tests/svn_test_utils.c&r1=1029227&r2=1029240&rev=1029240&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_utils.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/utils.c Sun Oct 31 04:06:09 2010
@@ -1,4 +1,4 @@
-/* svn_test_utils.c --- test utilities
+/* utils.c --- wc/client test utilities
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,11 +20,13 @@
* ====================================================================
*/
-#include "svn_test_utils.h"
-#include "svn_test_fs.h"
#include "svn_error.h"
#include "svn_client.h"
+#include "utils.h"
+
+#include "../svn_test_fs.h"
+
svn_error_t *
svn_test__create_repos_and_wc(const char **repos_url,
const char **wc_abspath,
Copied: subversion/trunk/subversion/tests/libsvn_wc/utils.h (from r1029227,
subversion/trunk/subversion/tests/svn_test_utils.h)
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/utils.h?p2=subversion/trunk/subversion/tests/libsvn_wc/utils.h&p1=subversion/trunk/subversion/tests/svn_test_utils.h&r1=1029227&r2=1029240&rev=1029240&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_utils.h (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/utils.h Sun Oct 31 04:06:09 2010
@@ -1,4 +1,4 @@
-/* svn_test_utils.h --- test utilities
+/* utils.h --- wc/client test utilities
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@
#include <apr_pools.h>
#include "svn_error.h"
-#include "svn_test.h"
+#include "../svn_test.h"
#ifdef __cplusplus
extern "C" {
