subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1619321 - in /subversion/trunk: build/run_tests.py subversion/tests/svn_test_main.c
Date Thu, 21 Aug 2014 09:20:10 GMT
Author: brane
Date: Thu Aug 21 09:20:09 2014
New Revision: 1619321

URL: http://svn.apache.org/r1619321
Log:
Follow up to r1619320: Commit missing files.

Modified:
    subversion/trunk/build/run_tests.py
    subversion/trunk/subversion/tests/svn_test_main.c

Modified: subversion/trunk/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1619321&r1=1619320&r2=1619321&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Thu Aug 21 09:20:09 2014
@@ -191,6 +191,13 @@ class TestHarness:
       TextColors.disable()
     self.skip_c_tests = (not not skip_c_tests)
 
+    # Parse out the FSFS version number
+    if self.fs_type is not None and self.fs_type.startswith('fsfs-v'):
+      self.fsfs_version = int(self.fs_type[6:])
+      self.fs_type = 'fsfs'
+    else:
+      self.fsfs_version = None
+
   def run(self, list):
     '''Run all test programs given in LIST. Print a summary of results, if
        there is a log file. Return zero iff all test programs passed.'''
@@ -384,6 +391,8 @@ class TestHarness:
       cmdline.append('--cleanup')
     if self.fs_type is not None:
       cmdline.append('--fs-type=' + self.fs_type)
+    if self.fsfs_version is not None:
+      cmdline.append('--fsfs-version=%d' % self.fsfs_version)
     if self.server_minor_version is not None:
       cmdline.append('--server-minor-version=' + self.server_minor_version)
     if self.list_tests is not None:
@@ -470,7 +479,7 @@ class TestHarness:
       svntest.main.options.enable_sasl = True
     if self.parallel is not None:
       try:
-        num_parallel = int(self.parallel) 
+        num_parallel = int(self.parallel)
       except exceptions.ValueError:
         num_parallel = svntest.main.default_num_threads
       if num_parallel > 1:
@@ -485,6 +494,8 @@ class TestHarness:
       svntest.main.options.cleanup = True
     if self.fs_type is not None:
       svntest.main.options.fs_type = self.fs_type
+    if self.fsfs_version is not None:
+      svntest.main.options.fsfs_version = self.fsfs_version
     if self.http_library is not None:
       svntest.main.options.http_library = self.http_library
     if self.server_minor_version is not None:

Modified: subversion/trunk/subversion/tests/svn_test_main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_main.c?rev=1619321&r1=1619320&r2=1619321&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_main.c (original)
+++ subversion/trunk/subversion/tests/svn_test_main.c Thu Aug 21 09:20:09 2014
@@ -103,7 +103,8 @@ enum test_options_e {
   srcdir_opt,
   mode_filter_opt,
   sqlite_log_opt,
-  parallel_opt
+  parallel_opt,
+  fsfs_version_opt
 };
 
 static const apr_getopt_option_t cl_options[] =
@@ -116,6 +117,8 @@ static const apr_getopt_option_t cl_opti
                     N_("specify test config file ARG")},
   {"fs-type",       fstype_opt, 1,
                     N_("specify a filesystem backend type ARG")},
+  {"fsfs-version",  fsfs_version_opt, 1,
+                    N_("specify the FSFS version ARG")},
   {"list",          list_opt, 0,
                     N_("lists all the tests with their short description")},
   {"mode-filter",   mode_filter_opt, 1,



Mime
View raw message