You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/03/06 19:40:12 UTC
svn commit: r1574988 - in /subversion/trunk/subversion/tests: ./
libsvn_client/ libsvn_delta/ libsvn_diff/ libsvn_fs/ libsvn_fs_base/
libsvn_fs_fs/ libsvn_fs_x/ libsvn_ra/ libsvn_ra_local/ libsvn_repos/
libsvn_subr/ libsvn_wc/
Author: brane
Date: Thu Mar 6 18:40:11 2014
New Revision: 1574988
URL: http://svn.apache.org/r1574988
Log:
Make the C tests work with the --enable-optimize configure option.
Because the main() funciton used to be defined in libsvn_test,
the -flto option (which performs rather aggressive link-time
optimizations) would cause the linker to remove all "unreferenced"
static funcitons ... which includes all the actual tests.
Which this change, main() is now defined in each test driver.
* subversion/tests/svn_test.h
(test_funcs, svn_test_max_threads): Remove external declarations.
(svn_test_main): New prototype for the (existing-but-renamed) test driver.
(SVN_TEST_MAIN): Bolierplate macro that generates a main() implementation.
* subversion/tests/svn_test_main.c
(svn_test_main): Renamed from 'main', and takes two extra parameters,
'max_threads' and 'test_funcs'. Propagates test_funcs to get_array_size,
do_test_num and do_tests_concurrently.
(get_array_size, do_test_num,
test_params_t, test_thread, do_tests_concurrently): Require a test_funcs
parameter. All uses updated.
* subversion/tests/libsvn_client/client-test.c,
subversion/tests/libsvn_client/mtcc-test.c,
subversion/tests/libsvn_delta/
subversion/tests/libsvn_delta/random-test.c,
subversion/tests/libsvn_delta/window-test.c,
subversion/tests/libsvn_diff/
subversion/tests/libsvn_diff/diff-diff3-test.c,
subversion/tests/libsvn_diff/parse-diff-test.c,
subversion/tests/libsvn_fs/
subversion/tests/libsvn_fs/fs-test.c,
subversion/tests/libsvn_fs/locks-test.c,
subversion/tests/libsvn_fs_base/
subversion/tests/libsvn_fs_base/changes-test.c,
subversion/tests/libsvn_fs_base/fs-base-test.c,
subversion/tests/libsvn_fs_base/strings-reps-test.c,
subversion/tests/libsvn_fs_fs/
subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c,
subversion/tests/libsvn_fs_x/
subversion/tests/libsvn_fs_x/fs-x-pack-test.c,
subversion/tests/libsvn_fs_x/string-table-test.c,
subversion/tests/libsvn_ra/
subversion/tests/libsvn_ra/ra-test.c,
subversion/tests/libsvn_ra_local/
subversion/tests/libsvn_ra_local/ra-local-test.c,
subversion/tests/libsvn_repos/
subversion/tests/libsvn_repos/repos-test.c,
subversion/tests/libsvn_subr/
subversion/tests/libsvn_subr/auth-test.c,
subversion/tests/libsvn_subr/cache-test.c,
subversion/tests/libsvn_subr/checksum-test.c,
subversion/tests/libsvn_subr/compat-test.c,
subversion/tests/libsvn_subr/config-test.c,
subversion/tests/libsvn_subr/crypto-test.c,
subversion/tests/libsvn_subr/dirent_uri-test.c,
subversion/tests/libsvn_subr/error-code-test.c,
subversion/tests/libsvn_subr/error-test.c,
subversion/tests/libsvn_subr/hashdump-test.c,
subversion/tests/libsvn_subr/io-test.c,
subversion/tests/libsvn_subr/mergeinfo-test.c,
subversion/tests/libsvn_subr/named_atomic-test.c,
subversion/tests/libsvn_subr/opt-test.c,
subversion/tests/libsvn_subr/packed-data-test.c,
subversion/tests/libsvn_subr/path-test.c,
subversion/tests/libsvn_subr/prefix-string-test.c,
subversion/tests/libsvn_subr/priority-queue-test.c,
subversion/tests/libsvn_subr/revision-test.c,
subversion/tests/libsvn_subr/root-pools-test.c,
subversion/tests/libsvn_subr/skel-test.c,
subversion/tests/libsvn_subr/spillbuf-test.c,
subversion/tests/libsvn_subr/sqlite-test.c,
subversion/tests/libsvn_subr/stream-test.c,
subversion/tests/libsvn_subr/string-test.c,
subversion/tests/libsvn_subr/subst_translate-test.c,
subversion/tests/libsvn_subr/time-test.c,
subversion/tests/libsvn_subr/translate-test.c,
subversion/tests/libsvn_subr/utf-test.c,
subversion/tests/libsvn_wc/
subversion/tests/libsvn_wc/conflict-data-test.c,
subversion/tests/libsvn_wc/db-test.c,
subversion/tests/libsvn_wc/entries-compat.c,
subversion/tests/libsvn_wc/op-depth-test.c,
subversion/tests/libsvn_wc/pristine-store-test.c,
subversion/tests/libsvn_wc/wc-queries-test.c,
subversion/tests/libsvn_wc/wc-test.c:
(max_threads): Renamed from svn_test_max_threads and made static.
(test_funcs): Made static.
(SVN_TEST_MAIN): Expanded boilerplate main() function.
Modified:
subversion/trunk/subversion/tests/libsvn_client/client-test.c
subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c
subversion/trunk/subversion/tests/libsvn_delta/random-test.c
subversion/trunk/subversion/tests/libsvn_delta/window-test.c
subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c
subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c
subversion/trunk/subversion/tests/libsvn_fs/fs-test.c
subversion/trunk/subversion/tests/libsvn_fs/locks-test.c
subversion/trunk/subversion/tests/libsvn_fs_base/changes-test.c
subversion/trunk/subversion/tests/libsvn_fs_base/fs-base-test.c
subversion/trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c
subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c
subversion/trunk/subversion/tests/libsvn_ra/ra-test.c
subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c
subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
subversion/trunk/subversion/tests/libsvn_subr/auth-test.c
subversion/trunk/subversion/tests/libsvn_subr/cache-test.c
subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c
subversion/trunk/subversion/tests/libsvn_subr/compat-test.c
subversion/trunk/subversion/tests/libsvn_subr/config-test.c
subversion/trunk/subversion/tests/libsvn_subr/crypto-test.c
subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/trunk/subversion/tests/libsvn_subr/error-code-test.c
subversion/trunk/subversion/tests/libsvn_subr/error-test.c
subversion/trunk/subversion/tests/libsvn_subr/hashdump-test.c
subversion/trunk/subversion/tests/libsvn_subr/io-test.c
subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c
subversion/trunk/subversion/tests/libsvn_subr/opt-test.c
subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c
subversion/trunk/subversion/tests/libsvn_subr/path-test.c
subversion/trunk/subversion/tests/libsvn_subr/prefix-string-test.c
subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c
subversion/trunk/subversion/tests/libsvn_subr/revision-test.c
subversion/trunk/subversion/tests/libsvn_subr/root-pools-test.c
subversion/trunk/subversion/tests/libsvn_subr/skel-test.c
subversion/trunk/subversion/tests/libsvn_subr/spillbuf-test.c
subversion/trunk/subversion/tests/libsvn_subr/sqlite-test.c
subversion/trunk/subversion/tests/libsvn_subr/stream-test.c
subversion/trunk/subversion/tests/libsvn_subr/string-test.c
subversion/trunk/subversion/tests/libsvn_subr/subst_translate-test.c
subversion/trunk/subversion/tests/libsvn_subr/time-test.c
subversion/trunk/subversion/tests/libsvn_subr/translate-test.c
subversion/trunk/subversion/tests/libsvn_subr/utf-test.c
subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
subversion/trunk/subversion/tests/libsvn_wc/db-test.c
subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c
subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
subversion/trunk/subversion/tests/libsvn_wc/wc-test.c
subversion/trunk/subversion/tests/svn_test.h
subversion/trunk/subversion/tests/svn_test_main.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=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/client-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/client-test.c Thu Mar 6 18:40:11 2014
@@ -829,9 +829,9 @@ test_suggest_mergesources(const svn_test
/* ========================================================================== */
-int svn_test_max_threads = 3;
+static int max_threads = 3;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_elide_mergeinfo_catalog,
@@ -850,3 +850,5 @@ struct svn_test_descriptor_t test_funcs[
"test svn_client_suggest_merge_sources"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/mtcc-test.c Thu Mar 6 18:40:11 2014
@@ -487,9 +487,9 @@ test_replace_tree(const svn_test_opts_t
/* ========================================================================== */
-int svn_test_max_threads = 3;
+static int max_threads = 3;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(test_mkdir,
@@ -510,4 +510,5 @@ struct svn_test_descriptor_t test_funcs[
"test mtcc replace tree"),
SVN_TEST_NULL
};
-
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_delta/random-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_delta/random-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_delta/random-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_delta/random-test.c Thu Mar 6 18:40:11 2014
@@ -524,9 +524,9 @@ random_combine_test(apr_pool_t *pool)
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(random_test,
@@ -539,3 +539,5 @@ struct svn_test_descriptor_t test_funcs[
#endif
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_delta/window-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_delta/window-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_delta/window-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_delta/window-test.c Thu Mar 6 18:40:11 2014
@@ -100,12 +100,14 @@ stream_window_test(apr_pool_t *pool)
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(stream_window_test,
"txdelta stream and windows test"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_diff/diff-diff3-test.c Thu Mar 6 18:40:11 2014
@@ -2951,9 +2951,9 @@ two_way_issue_3362_v2(apr_pool_t *pool)
/* ========================================================================== */
-int svn_test_max_threads = 4;
+static int max_threads = 4;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(dump_core,
@@ -2992,3 +2992,5 @@ struct svn_test_descriptor_t test_funcs[
"2-way issue #3362 test v2"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c Thu Mar 6 18:40:11 2014
@@ -962,9 +962,9 @@ test_parse_unidiff_lacking_trailing_eol(
/* ========================================================================== */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_parse_unidiff,
@@ -987,3 +987,5 @@ struct svn_test_descriptor_t test_funcs[
"test parsing unidiffs lacking trailing eol"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs/fs-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs/fs-test.c Thu Mar 6 18:40:11 2014
@@ -5313,9 +5313,9 @@ dir_prop_merge(const svn_test_opts_t *op
/* The test table. */
-int svn_test_max_threads = 8;
+static int max_threads = 8;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(trivial_transaction,
@@ -5405,3 +5405,5 @@ struct svn_test_descriptor_t test_funcs[
"test merge directory properties"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_fs/locks-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs/locks-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs/locks-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs/locks-test.c Thu Mar 6 18:40:11 2014
@@ -792,9 +792,9 @@ lock_out_of_date(const svn_test_opts_t *
/* The test table. */
-int svn_test_max_threads = 2;
+static int max_threads = 2;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(lock_expiration,
@@ -821,3 +821,5 @@ struct svn_test_descriptor_t test_funcs[
"check out-of-dateness before locking"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_fs_base/changes-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_base/changes-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_base/changes-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_base/changes-test.c Thu Mar 6 18:40:11 2014
@@ -903,9 +903,9 @@ changes_bad_sequences(const svn_test_opt
/* The test table. */
-int svn_test_max_threads = 4;
+static int max_threads = 4;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(changes_add,
@@ -922,3 +922,5 @@ struct svn_test_descriptor_t test_funcs[
"verify that bad change sequences raise errors"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_fs_base/fs-base-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_base/fs-base-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_base/fs-base-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_base/fs-base-test.c Thu Mar 6 18:40:11 2014
@@ -1519,9 +1519,9 @@ key_test(apr_pool_t *pool)
/* The test table. */
-int svn_test_max_threads = 2;
+static int max_threads = 2;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(create_berkeley_filesystem,
@@ -1548,3 +1548,5 @@ struct svn_test_descriptor_t test_funcs[
"testing sequential alphanumeric key generation"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_base/strings-reps-test.c Thu Mar 6 18:40:11 2014
@@ -732,9 +732,9 @@ copy_string(const svn_test_opts_t *opts,
/* The test table. */
-int svn_test_max_threads = 3;
+static int max_threads = 3;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(write_new_rep,
@@ -755,3 +755,5 @@ struct svn_test_descriptor_t test_funcs[
"create and copy a string"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c Thu Mar 6 18:40:11 2014
@@ -1130,9 +1130,9 @@ upgrade_old_txns_to_log_addressing(const
/* The test table. */
-int svn_test_max_threads = 4;
+static int max_threads = 4;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(pack_filesystem,
@@ -1165,3 +1165,5 @@ struct svn_test_descriptor_t test_funcs[
"upgrade txns started before svnadmin upgrade"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c Thu Mar 6 18:40:11 2014
@@ -864,9 +864,9 @@ pack_shard_size_one(const svn_test_opts_
/* The test table. */
-int svn_test_max_threads = 4;
+static int max_threads = 4;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(pack_filesystem,
@@ -895,3 +895,5 @@ struct svn_test_descriptor_t test_funcs[
"test packing with shard size = 1"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_x/string-table-test.c Thu Mar 6 18:40:11 2014
@@ -288,9 +288,9 @@ store_load_many_strings_table(apr_pool_t
/* The test table. */
-int svn_test_max_threads = 4;
+static int max_threads = 4;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(create_empty_table,
@@ -311,3 +311,5 @@ struct svn_test_descriptor_t test_funcs[
"store and load string table with many strings"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_ra/ra-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_ra/ra-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_ra/ra-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_ra/ra-test.c Thu Mar 6 18:40:11 2014
@@ -328,9 +328,9 @@ tunnel_callback_test(const svn_test_opts
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(location_segments_test,
@@ -341,3 +341,5 @@ struct svn_test_descriptor_t test_funcs[
"test ra_svn tunnel creation callbacks"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c Thu Mar 6 18:40:11 2014
@@ -279,9 +279,9 @@ split_url_test(const svn_test_opts_t *op
#define HAS_UNC_HOST 0
#endif
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(open_ra_session,
@@ -298,3 +298,5 @@ struct svn_test_descriptor_t test_funcs[
"test svn_ra_local__split_URL correctness"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/repos-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_repos/repos-test.c Thu Mar 6 18:40:11 2014
@@ -3615,9 +3615,9 @@ test_dump_r0_mergeinfo(const svn_test_op
/* The test table. */
-int svn_test_max_threads = 4;
+static int max_threads = 4;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(dir_deltas,
@@ -3670,3 +3670,5 @@ struct svn_test_descriptor_t test_funcs[
"test dumping with r0 mergeinfo"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/auth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/auth-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/auth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/auth-test.c Thu Mar 6 18:40:11 2014
@@ -315,9 +315,9 @@ test_auth_clear(apr_pool_t *pool)
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_platform_specific_auth_providers,
@@ -326,3 +326,5 @@ struct svn_test_descriptor_t test_funcs[
"test svn_auth_clear()"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/cache-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/cache-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/cache-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/cache-test.c Thu Mar 6 18:40:11 2014
@@ -259,9 +259,9 @@ test_memcache_long_key(const svn_test_op
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_inprocess_cache_basic,
@@ -274,3 +274,5 @@ struct svn_test_descriptor_t test_funcs[
"basic membuffer svn_cache test"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/checksum-test.c Thu Mar 6 18:40:11 2014
@@ -287,9 +287,9 @@ zlib_expansion_test(const svn_test_opts_
/* An array of all test functions */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_checksum_parse,
@@ -306,3 +306,5 @@ struct svn_test_descriptor_t test_funcs[
"zero checksum cross-type matching"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/compat-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/compat-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/compat-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/compat-test.c Thu Mar 6 18:40:11 2014
@@ -210,9 +210,9 @@ test_version_at_least(apr_pool_t *pool)
/* An array of all test functions */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_version_compatibility,
@@ -223,3 +223,5 @@ struct svn_test_descriptor_t test_funcs[
"svn_version__at_least"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/config-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/config-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/config-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/config-test.c Thu Mar 6 18:40:11 2014
@@ -344,9 +344,9 @@ test_read_only_mode(const svn_test_opts_
/* An array of all test functions */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(test_text_retrieval,
@@ -367,3 +367,5 @@ struct svn_test_descriptor_t test_funcs[
"test r/o mode"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/crypto-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/crypto-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/crypto-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/crypto-test.c Thu Mar 6 18:40:11 2014
@@ -177,9 +177,9 @@ test_passphrase_check(apr_pool_t *pool)
/* The test table. */
-int svn_test_max_threads = -1;
+static int max_threads = -1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_encrypt_decrypt_password,
@@ -188,3 +188,5 @@ struct svn_test_descriptor_t test_funcs[
"password checktext generation/validation"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Thu Mar 6 18:40:11 2014
@@ -2717,9 +2717,9 @@ test_fspath_get_longest_ancestor(apr_poo
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_dirent_is_root,
@@ -2816,3 +2816,5 @@ struct svn_test_descriptor_t test_funcs[
"test svn_fspath__get_longest_ancestor"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/error-code-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/error-code-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/error-code-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/error-code-test.c Thu Mar 6 18:40:11 2014
@@ -74,12 +74,14 @@ check_error_codes_unique(apr_pool_t *poo
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(check_error_codes_unique,
"check that error codes are unique"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/error-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/error-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/error-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/error-test.c Thu Mar 6 18:40:11 2014
@@ -229,9 +229,9 @@ test_error_symbolic_name(apr_pool_t *poo
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_error_root_cause,
@@ -242,3 +242,5 @@ struct svn_test_descriptor_t test_funcs[
"test svn_error_symbolic_name"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/hashdump-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/hashdump-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/hashdump-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/hashdump-test.c Thu Mar 6 18:40:11 2014
@@ -179,9 +179,9 @@ test3(apr_pool_t *pool)
/* An array of all test functions */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test1,
@@ -192,3 +192,5 @@ struct svn_test_descriptor_t test_funcs[
"write hash out, read back in, compare"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/io-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/io-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/io-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/io-test.c Thu Mar 6 18:40:11 2014
@@ -683,9 +683,9 @@ aligned_seek_test(apr_pool_t *pool)
/* The test table. */
-int svn_test_max_threads = 3;
+static int max_threads = 3;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_two_file_size_comparison,
@@ -702,3 +702,5 @@ struct svn_test_descriptor_t test_funcs[
"test aligned seek"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c Thu Mar 6 18:40:11 2014
@@ -1673,9 +1673,9 @@ test_remove_prefix_from_catalog(apr_pool
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_parse_single_line_mergeinfo,
@@ -1716,3 +1716,5 @@ struct svn_test_descriptor_t test_funcs[
"removal of prefix paths from catalog keys"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c Thu Mar 6 18:40:11 2014
@@ -750,9 +750,9 @@ test_multiprocess(apr_pool_t *pool)
/* An array of all test functions */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_basics,
@@ -769,3 +769,5 @@ struct svn_test_descriptor_t test_funcs[
"multi-process access to atomics"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/opt-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/opt-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/opt-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/opt-test.c Thu Mar 6 18:40:11 2014
@@ -193,9 +193,9 @@ test_svn_opt_args_to_target_array2(apr_p
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_parse_peg_rev,
@@ -204,3 +204,5 @@ struct svn_test_descriptor_t test_funcs[
"test svn_opt_args_to_target_array2"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/packed-data-test.c Thu Mar 6 18:40:11 2014
@@ -548,9 +548,9 @@ test_full_structure(apr_pool_t *pool)
/* An array of all test functions */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_empty_container,
@@ -567,3 +567,5 @@ struct svn_test_descriptor_t test_funcs[
"test nested structure"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/path-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/path-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/path-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/path-test.c Thu Mar 6 18:40:11 2014
@@ -1701,9 +1701,9 @@ test_path_resolve_repos_relative_url(apr
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_path_is_child,
@@ -1762,3 +1762,5 @@ struct svn_test_descriptor_t test_funcs[
"test svn_path_resolve_repos_relative_url"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/prefix-string-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/prefix-string-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/prefix-string-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/prefix-string-test.c Thu Mar 6 18:40:11 2014
@@ -137,9 +137,9 @@ test_string_comparison(apr_pool_t *pool)
/* An array of all test functions */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_empty_string,
@@ -150,3 +150,5 @@ struct svn_test_descriptor_t test_funcs[
"compare strings"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/priority-queue-test.c Thu Mar 6 18:40:11 2014
@@ -221,9 +221,9 @@ test_update(apr_pool_t *pool)
/* An array of all test functions */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_empty_queue,
@@ -236,3 +236,5 @@ struct svn_test_descriptor_t test_funcs[
"updating the head of the queue"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/revision-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/revision-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/revision-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/revision-test.c Thu Mar 6 18:40:11 2014
@@ -123,12 +123,14 @@ test_revnum_parse(apr_pool_t *pool)
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_revnum_parse,
"test svn_revnum_parse"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/root-pools-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/root-pools-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/root-pools-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/root-pools-test.c Thu Mar 6 18:40:11 2014
@@ -121,9 +121,9 @@ test_root_pool_concurrency(apr_pool_t *p
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_root_pool,
@@ -133,3 +133,5 @@ struct svn_test_descriptor_t test_funcs[
"test concurrent root pool recycling"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/skel-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/skel-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/skel-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/skel-test.c Thu Mar 6 18:40:11 2014
@@ -886,9 +886,9 @@ unparse_list(apr_pool_t *pool)
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(parse_implicit_length,
@@ -905,3 +905,5 @@ struct svn_test_descriptor_t test_funcs[
"unparse lists"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/spillbuf-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/spillbuf-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/spillbuf-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/spillbuf-test.c Thu Mar 6 18:40:11 2014
@@ -561,9 +561,9 @@ test_spillbuf_file_attrs_spill_all(apr_p
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_spillbuf_basic, "basic spill buffer test"),
@@ -592,3 +592,5 @@ struct svn_test_descriptor_t test_funcs[
"check spill file properties (spill-all-data)"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/sqlite-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/sqlite-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/sqlite-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/sqlite-test.c Thu Mar 6 18:40:11 2014
@@ -114,12 +114,14 @@ test_sqlite_reset(apr_pool_t *pool)
}
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_sqlite_reset,
"sqlite reset"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/stream-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/stream-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/stream-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/stream-test.c Thu Mar 6 18:40:11 2014
@@ -773,9 +773,9 @@ test_stringbuf_from_stream(apr_pool_t *p
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_stream_from_string,
@@ -802,3 +802,5 @@ struct svn_test_descriptor_t test_funcs[
"test svn_stringbuf_from_stream"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/string-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/string-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/string-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/string-test.c Thu Mar 6 18:40:11 2014
@@ -834,9 +834,9 @@ test_string_matching(apr_pool_t *pool)
/* An array of all test functions */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test1,
@@ -901,3 +901,5 @@ struct svn_test_descriptor_t test_funcs[
"test string matching"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/subst_translate-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/subst_translate-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/subst_translate-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/subst_translate-test.c Thu Mar 6 18:40:11 2014
@@ -501,9 +501,9 @@ test_svn_subst_long_keywords(apr_pool_t
return SVN_NO_ERROR;
}
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_svn_subst_translate_string2,
@@ -522,3 +522,6 @@ struct svn_test_descriptor_t test_funcs[
"test long keywords (issue 4350)"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
+
Modified: subversion/trunk/subversion/tests/libsvn_subr/time-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/time-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/time-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/time-test.c Thu Mar 6 18:40:11 2014
@@ -339,9 +339,9 @@ test_parse_date(apr_pool_t *pool)
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_time_to_cstring,
@@ -356,3 +356,5 @@ struct svn_test_descriptor_t test_funcs[
"test svn_parse_date"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/translate-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/translate-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/translate-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/translate-test.c Thu Mar 6 18:40:11 2014
@@ -1268,9 +1268,9 @@ mixed_to_crlf_unexpand_author_date_rev_u
/* The test table. */
-int svn_test_max_threads = 7;
+static int max_threads = 7;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
/* The no-op conversion. */
@@ -1364,3 +1364,5 @@ struct svn_test_descriptor_t test_funcs[
"mixed_to_crlf; unexpand author, date, rev, url"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_subr/utf-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/utf-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/utf-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/utf-test.c Thu Mar 6 18:40:11 2014
@@ -740,9 +740,9 @@ test_utf_is_normalized(apr_pool_t *pool)
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(utf_validate,
@@ -763,3 +763,5 @@ struct svn_test_descriptor_t test_funcs[
"test svn_utf__is_normalized"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c Thu Mar 6 18:40:11 2014
@@ -810,9 +810,9 @@ test_prop_conflicts(const svn_test_opts_
/* The test table. */
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_deserialize_tree_conflict,
@@ -832,3 +832,4 @@ struct svn_test_descriptor_t test_funcs[
SVN_TEST_NULL
};
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_wc/db-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/db-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Thu Mar 6 18:40:11 2014
@@ -1526,9 +1526,9 @@ test_externals_store(apr_pool_t *pool)
return SVN_NO_ERROR;
}
-int svn_test_max_threads = 2;
+static int max_threads = 2;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_getting_info,
@@ -1553,3 +1553,5 @@ struct svn_test_descriptor_t test_funcs[
"externals store"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c Thu Mar 6 18:40:11 2014
@@ -639,9 +639,9 @@ test_access_baton_like_locking(apr_pool_
}
-int svn_test_max_threads = -1;
+static int max_threads = -1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_entries_alloc,
@@ -652,3 +652,5 @@ struct svn_test_descriptor_t test_funcs[
"access baton like locks must work with wc-ng"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
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=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Thu Mar 6 18:40:11 2014
@@ -9574,9 +9574,9 @@ movedhere_extract_retract(const svn_test
/* ---------------------------------------------------------------------- */
/* The list of test functions */
-int svn_test_max_threads = 2;
+static int max_threads = 2;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(test_wc_wc_copies,
@@ -9762,3 +9762,5 @@ struct svn_test_descriptor_t test_funcs[
"movedhere extract retract"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
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=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c Thu Mar 6 18:40:11 2014
@@ -319,9 +319,9 @@ reject_mismatching_text(const svn_test_o
}
-int svn_test_max_threads = -1;
+static int max_threads = -1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(pristine_write_read,
@@ -332,3 +332,5 @@ struct svn_test_descriptor_t test_funcs[
"reject_mismatching_text"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c Thu Mar 6 18:40:11 2014
@@ -976,9 +976,9 @@ test_schema_statistics(apr_pool_t *scrat
return SVN_NO_ERROR;
}
-int svn_test_max_threads = 1;
+static int max_threads = 1;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_PASS2(test_sqlite_version,
@@ -993,3 +993,5 @@ struct svn_test_descriptor_t test_funcs[
"test schema statistics"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/libsvn_wc/wc-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/wc-test.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/wc-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/wc-test.c Thu Mar 6 18:40:11 2014
@@ -310,9 +310,9 @@ test_externals_parse_erratic(apr_pool_t
/* ---------------------------------------------------------------------- */
/* The list of test functions */
-int svn_test_max_threads = 2;
+static int max_threads = 2;
-struct svn_test_descriptor_t test_funcs[] =
+static struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
SVN_TEST_OPTS_PASS(test_node_get_base,
@@ -325,3 +325,5 @@ struct svn_test_descriptor_t test_funcs[
"parse erratic externals definition"),
SVN_TEST_NULL
};
+
+SVN_TEST_MAIN
Modified: subversion/trunk/subversion/tests/svn_test.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test.h?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test.h (original)
+++ subversion/trunk/subversion/tests/svn_test.h Thu Mar 6 18:40:11 2014
@@ -151,8 +151,22 @@ struct svn_test_descriptor_t
/* All Subversion test programs include an array of svn_test_descriptor_t's
* (all of our sub-tests) that begins and ends with a SVN_TEST_NULL entry.
+ * This descriptor must be passed to the svn_test_main function.
+ *
+ * MAX_THREADS is the number of concurrent tests to run. Set to 1 if
+ * all tests must be executed serially. Numbers less than 1 mean
+ * "unbounded".
*/
-extern struct svn_test_descriptor_t test_funcs[];
+int svn_test_main(int argc, const char *argv[], int max_threads,
+ struct svn_test_descriptor_t *test_funcs);
+
+/* Boilerplate for the main function for each test program. */
+#define SVN_TEST_MAIN \
+ int main(int argc, const char *argv[]) \
+ { \
+ return svn_test_main(argc, argv, \
+ max_threads, test_funcs); \
+ }
/* A null initializer for the test descriptor. */
#define SVN_TEST_NULL {0}
@@ -189,10 +203,6 @@ extern struct svn_test_descriptor_t test
#define SVN_TEST_OPTS_WIMP_COND(func, p, msg, wip) \
{(p) ? svn_test_xfail : svn_test_pass, NULL, func, msg, wip}
-/* Maximum number of concurrent test threads. Set to 1 if all tests must
- be executed serially. Numbers less than 1 mean "unbounded" */
-extern int svn_test_max_threads;
-
/* Return a pseudo-random number based on SEED, and modify SEED.
*
Modified: subversion/trunk/subversion/tests/svn_test_main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_main.c?rev=1574988&r1=1574987&r2=1574988&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_main.c (original)
+++ subversion/trunk/subversion/tests/svn_test_main.c Thu Mar 6 18:40:11 2014
@@ -230,7 +230,7 @@ svn_test_rand(apr_uint32_t *seed)
/* Determine the array size of test_funcs[], the inelegant way. :) */
static int
-get_array_size(void)
+get_array_size(struct svn_test_descriptor_t *test_funcs)
{
int i;
@@ -340,6 +340,7 @@ log_results(const char *progname,
static svn_boolean_t
do_test_num(const char *progname,
int test_num,
+ struct svn_test_descriptor_t *test_funcs,
svn_boolean_t msg_only,
svn_test_opts_t *opts,
const char **header_msg,
@@ -349,7 +350,7 @@ do_test_num(const char *progname,
svn_error_t *err = NULL;
const char *msg = NULL; /* the message this individual test prints out */
const struct svn_test_descriptor_t *desc;
- const int array_size = get_array_size();
+ const int array_size = get_array_size(test_funcs);
svn_boolean_t run_this_test; /* This test's mode matches DESC->MODE. */
/* Check our array bounds! */
@@ -443,6 +444,9 @@ typedef struct test_params_t
/* Test to execute next. */
svn_atomic_t test_num;
+
+ /* Test functions array. */
+ struct svn_test_descriptor_t *test_funcs;
} test_params_t;
/* Thread function similar to do_test_num() but with fewer options. We do
@@ -467,7 +471,7 @@ test_thread(apr_thread_t *thread, void *
{
svn_pool_clear(pool);
- desc = &test_funcs[test_num];
+ desc = ¶ms->test_funcs[test_num];
skip = desc->mode == svn_test_skip;
xfail = desc->mode == svn_test_xfail;
wimp = xfail && desc->wip;
@@ -520,6 +524,7 @@ test_thread(apr_thread_t *thread, void *
*/
static svn_boolean_t
do_tests_concurrently(const char *progname,
+ struct svn_test_descriptor_t *test_funcs,
int array_size,
int max_threads,
svn_test_opts_t *opts,
@@ -534,6 +539,7 @@ do_tests_concurrently(const char *progna
params.opts = opts;
params.progname = progname;
params.test_num = 1;
+ params.test_funcs = test_funcs;
params.test_count = array_size;
/* Start all threads. */
@@ -627,7 +633,8 @@ svn_test_data_path(const char *base_name
/* Standard svn test program */
int
-main(int argc, const char *argv[])
+svn_test_main(int argc, const char *argv[], int max_threads,
+ struct svn_test_descriptor_t *test_funcs)
{
const char *prog_name;
int i;
@@ -641,7 +648,7 @@ main(int argc, const char *argv[])
svn_error_t *err;
char errmsg[200];
/* How many tests are there? */
- int array_size = get_array_size();
+ int array_size = get_array_size(test_funcs);
svn_test_opts_t opts = { NULL };
@@ -844,8 +851,8 @@ main(int argc, const char *argv[])
"------ ----- ----------------\n";
for (i = 1; i <= array_size; i++)
{
- if (do_test_num(prog_name, i, TRUE, &opts, &header_msg,
- test_pool))
+ if (do_test_num(prog_name, i, test_funcs,
+ TRUE, &opts, &header_msg, test_pool))
got_error = TRUE;
/* Clear the per-function pool */
@@ -865,8 +872,8 @@ main(int argc, const char *argv[])
continue;
ran_a_test = TRUE;
- if (do_test_num(prog_name, test_num, FALSE, &opts, NULL,
- test_pool))
+ if (do_test_num(prog_name, test_num, test_funcs,
+ FALSE, &opts, NULL, test_pool))
got_error = TRUE;
/* Clear the per-function pool */
@@ -880,14 +887,15 @@ main(int argc, const char *argv[])
if (! ran_a_test)
{
/* just run all tests */
- if (svn_test_max_threads < 1)
- svn_test_max_threads = array_size;
+ if (max_threads < 1)
+ max_threads = array_size;
- if (svn_test_max_threads == 1 || !parallel)
+ if (max_threads == 1 || !parallel)
{
for (i = 1; i <= array_size; i++)
{
- if (do_test_num(prog_name, i, FALSE, &opts, NULL, test_pool))
+ if (do_test_num(prog_name, i, test_funcs,
+ FALSE, &opts, NULL, test_pool))
got_error = TRUE;
/* Clear the per-function pool */
@@ -898,8 +906,8 @@ main(int argc, const char *argv[])
#if APR_HAS_THREADS
else
{
- got_error = do_tests_concurrently(prog_name, array_size,
- svn_test_max_threads,
+ got_error = do_tests_concurrently(prog_name, test_funcs,
+ array_size, max_threads,
&opts, test_pool);
/* Execute all cleanups */