subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1576824 [7/7] - in /subversion/branches/fsfs-lock-many: ./ build/generator/ build/generator/templates/ subversion/bindings/ctypes-python/test/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/t...
Date Wed, 12 Mar 2014 17:18:26 GMT
Modified: subversion/branches/fsfs-lock-many/subversion/tests/svn_test_main.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/subversion/tests/svn_test_main.c?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/subversion/tests/svn_test_main.c (original)
+++ subversion/branches/fsfs-lock-many/subversion/tests/svn_test_main.c Wed Mar 12 17:18:20
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 = &params->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 */

Modified: subversion/branches/fsfs-lock-many/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
(original)
+++ subversion/branches/fsfs-lock-many/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
Wed Mar 12 17:18:20 2014
@@ -28,7 +28,7 @@ PUSHD ..\deps
 ECHO Checking dependencies in %CD%
 
 IF NOT EXIST "imports\" (
-    svn co --username guest --password "" http://sharpsvn.open.collab.net/svn/sharpsvn/trunk/imports
imports
+    svn co --username guest --password "" https://ctf.open.collab.net/svn/repos/sharpsvn/trunk/imports
imports
 )
 IF NOT EXIST build\imports.done (
     svn up imports

Modified: subversion/branches/fsfs-lock-many/tools/server-side/fsfs-stats.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-lock-many/tools/server-side/fsfs-stats.c?rev=1576824&r1=1576823&r2=1576824&view=diff
==============================================================================
--- subversion/branches/fsfs-lock-many/tools/server-side/fsfs-stats.c (original)
+++ subversion/branches/fsfs-lock-many/tools/server-side/fsfs-stats.c Wed Mar 12 17:18:20
2014
@@ -27,7 +27,6 @@
 #include <apr_general.h>
 #include <apr_file_io.h>
 
-#include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_diff.h"
 #include "svn_fs.h"



Mime
View raw message