subversion 1.6.6-x86-mswin32-60 → 1.6.11-x86-mswin32-60

data/subversion/test/util.rb

@@ -0,0 +1,292 @@
+require "fileutils"
+require "pathname"
+
+require "my-assertions"
+
+class Time
+  unless instance_methods.include?("to_int")
+    alias to_int to_i
+  end
+end
+
+require 'greek_tree'
+
+module SvnTestUtil
+  def setup_default_variables
+    @author = ENV["USER"] || "sample-user"
+    @password = "sample-password"
+    @realm = "sample realm"
+    @repos_path = "repos"
+    @full_repos_path = File.expand_path(@repos_path)
+    @repos_uri = "file://#{@full_repos_path.sub(/^\/?/, '/')}"
+    @svnserve_host = "127.0.0.1"
+    @svnserve_ports = (64152..64282).collect{|x| x.to_s}
+    @wc_base_dir = "wc-tmp"
+    @wc_path = File.join(@wc_base_dir, "wc")
+    @full_wc_path = File.expand_path(@wc_path)
+    @tmp_path = "tmp"
+    @config_path = "config"
+    @greek = Greek.new(@tmp_path, @wc_path, @repos_uri)
+  end
+
+  def setup_basic(need_svnserve=false)
+    @need_svnserve = need_svnserve
+    setup_default_variables
+    setup_tmp
+    setup_repository
+    add_hooks
+    setup_svnserve if @need_svnserve
+    setup_config
+    setup_wc
+    add_authentication
+    GC.stress = true if GC.respond_to?(:stress=) and $DEBUG
+  end
+
+  def teardown_basic
+    GC.stress = false if GC.respond_to?(:stress=)
+    teardown_svnserve if @need_svnserve
+    teardown_repository
+    teardown_wc
+    teardown_config
+    teardown_tmp
+    gc
+  end
+
+  def gc
+    if $DEBUG
+      before_pools = Svn::Core::Pool.number_of_pools
+      puts
+      puts "before pools: #{before_pools}"
+    end
+    gc_enable do
+      GC.start
+    end
+    if $DEBUG
+      after_pools = Svn::Core::Pool.number_of_pools
+      puts "after pools: #{after_pools}"
+      STDOUT.flush
+    end
+  end
+
+  def change_gc_status(prev_disabled)
+    begin
+      yield
+    ensure
+      if prev_disabled
+        GC.disable
+      else
+        GC.enable
+      end
+    end
+  end
+
+  def gc_disable(&block)
+    change_gc_status(GC.disable, &block)
+  end
+
+  def gc_enable(&block)
+    change_gc_status(GC.enable, &block)
+  end
+
+  def setup_tmp(path=@tmp_path)
+    FileUtils.rm_rf(path)
+    FileUtils.mkdir_p(path)
+  end
+
+  def teardown_tmp(path=@tmp_path)
+    FileUtils.rm_rf(path)
+  end
+
+  def setup_repository(path=@repos_path, config={}, fs_config={})
+    require "svn/repos"
+    FileUtils.rm_rf(path)
+    FileUtils.mkdir_p(File.dirname(path))
+    @repos = Svn::Repos.create(path, config, fs_config)
+    @fs = @repos.fs
+  end
+
+  def teardown_repository(path=@repos_path)
+    @fs.close unless @fs.nil?
+    @repos.close unless @repos.nil?
+    Svn::Repos.delete(path) if File.exists?(path)
+    @repos = nil
+    @fs = nil
+  end
+
+  def setup_wc
+    teardown_wc
+    make_context("").checkout(@repos_uri, @wc_path)
+  end
+
+  def teardown_wc
+    FileUtils.rm_rf(@wc_base_dir)
+  end
+
+  def setup_config
+    teardown_config
+    Svn::Core::Config.ensure(@config_path)
+  end
+
+  def teardown_config
+    FileUtils.rm_rf(@config_path)
+  end
+
+  def add_authentication
+    passwd_file = "passwd"
+    File.open(@repos.svnserve_conf, "w") do |conf|
+      conf.print <<-CONF
+[general]
+anon-access = none
+auth-access = write
+password-db = #{passwd_file}
+realm = #{@realm}
+      CONF
+    end
+    File.open(File.join(@repos.conf_dir, passwd_file), "w") do |f|
+      f.print <<-PASSWD
+[users]
+#{@author} = #{@password}
+      PASSWD
+    end
+  end
+
+  def add_hooks
+    add_pre_revprop_change_hook
+  end
+
+  def youngest_rev
+    @fs.youngest_rev
+  end
+
+  def root(rev=nil)
+    @fs.root(rev)
+  end
+
+  def prop(name, rev=nil)
+    @fs.prop(name, rev)
+  end
+
+  def make_context(log)
+    ctx = Svn::Client::Context.new
+    ctx.set_log_msg_func do |items|
+      [true, log]
+    end
+    ctx.add_username_prompt_provider(0) do |cred, realm, username, may_save|
+      cred.username = @author
+      cred.may_save = false
+    end
+    setup_auth_baton(ctx.auth_baton)
+    return ctx unless block_given?
+    begin
+      yield ctx
+    ensure
+      ctx.destroy
+    end
+  end
+
+  def setup_auth_baton(auth_baton)
+    auth_baton[Svn::Core::AUTH_PARAM_CONFIG_DIR] = @config_path
+    auth_baton[Svn::Core::AUTH_PARAM_DEFAULT_USERNAME] = @author
+  end
+
+  def normalize_line_break(str)
+    if windows?
+      str.gsub(/\n/, "\r\n")
+    else
+      str
+    end
+  end
+
+  def setup_greek_tree
+    @greek.setup(make_context("setup greek tree"))
+  end
+
+  module_function
+  def windows?
+    /cygwin|mingw|mswin32|bccwin32/.match(RUBY_PLATFORM)
+  end
+
+  module Svnserve
+    def setup_svnserve
+      @svnserve_port = nil
+      @repos_svnserve_uri = nil
+
+      # Look through the list of potential ports until we're able to
+      # successfully start svnserve on a free one.
+      @svnserve_ports.each do |port|
+        @svnserve_pid = fork {
+          STDERR.close
+          exec("svnserve",
+               "--listen-host", @svnserve_host,
+               "--listen-port", port,
+               "-d", "--foreground")
+        }
+        pid, status = Process.waitpid2(@svnserve_pid, Process::WNOHANG)
+        if status and status.exited?
+          if $DEBUG
+            STDERR.puts "port #{port} couldn't be used for svnserve"
+          end
+        else
+          # svnserve started successfully.  Note port number and cease
+          # startup attempts.
+          @svnserve_port = port
+          @repos_svnserve_uri =
+            "svn://#{@svnserve_host}:#{@svnserve_port}#{@full_repos_path}"
+          break
+        end
+      end
+      if @svnserve_port.nil?
+        msg = "Can't run svnserve because available port "
+        msg << "isn't exist in [#{@svnserve_ports.join(', ')}]"
+        raise msg
+      end
+    end
+
+    def teardown_svnserve
+      if @svnserve_pid
+        Process.kill(:TERM, @svnserve_pid)
+        begin
+          Process.waitpid(@svnserve_pid)
+        rescue Errno::ECHILD
+        end
+      end
+    end
+
+    def add_pre_revprop_change_hook
+      File.open(@repos.pre_revprop_change_hook, "w") do |hook|
+        hook.print <<-HOOK
+#!/bin/sh
+REPOS="$1"
+REV="$2"
+USER="$3"
+PROPNAME="$4"
+
+if [ "$PROPNAME" = "#{Svn::Core::PROP_REVISION_LOG}" -a \
+     "$USER" = "#{@author}" ]; then
+  exit 0
+fi
+
+exit 1
+        HOOK
+      end
+      FileUtils.chmod(0755, @repos.pre_revprop_change_hook)
+    end
+  end
+
+  module SetupEnvironment
+    def setup_test_environment(top_dir, base_dir, ext_dir)
+      svnserve_dir = File.join(top_dir, 'subversion', 'svnserve')
+      ENV["PATH"] = "#{svnserve_dir}:#{ENV['PATH']}"
+      FileUtils.ln_sf(File.join(base_dir, ".libs"), ext_dir)
+    end
+  end
+
+  if windows?
+    require 'windows_util'
+    include Windows::Svnserve
+    extend Windows::SetupEnvironment
+  else
+    include Svnserve
+    extend SetupEnvironment
+  end
+end

data/subversion/test/windows_util.rb

@@ -0,0 +1,263 @@
+require 'etc'
+require 'fileutils'
+
+module SvnTestUtil
+  module Windows
+    module Svnserve
+      def service_name
+        "test-svn-server--port-#{@svnserve_port}"
+      end
+
+      class << self
+        def escape_value(value)
+          escaped_value = value.gsub(/"/, '\\"') # "
+          "\"#{escaped_value}\""
+        end
+      end
+
+      def service_control(command, args={})
+        args = args.collect do |key, value|
+          "#{key}= #{Svnserve.escape_value(value)}"
+        end.join(" ")
+        result = `sc #{command} #{service_name} #{args}`
+        if result.match(/FAILED/)
+          raise "Failed to #{command} #{service_name}: #{args}"
+        end
+        /^\s*STATE\s*:\s\d+\s*(.*?)\s*$/ =~ result
+        $1
+      end
+
+      def grant_everyone_full_access(dir)
+        dir = dir.tr(File::SEPARATOR, File::ALT_SEPARATOR)
+        `cacls #{Svnserve.escape_value(dir)} /T /E /P Everyone:F`
+      end
+
+      def service_exists?
+        begin
+          service_control("query")
+          true
+        rescue
+          false
+        end
+      end
+
+      def service_stopped?
+        "STOPPED" == service_control("query") rescue true
+      end
+
+      def setup_svnserve
+        @svnserve_port = @svnserve_ports.last
+        @repos_svnserve_uri = "svn://#{@svnserve_host}:#{@svnserve_port}"
+        grant_everyone_full_access(@full_repos_path)
+
+        @@service_created ||= begin
+          @@service_created = true
+          service_control('stop') unless service_stopped?
+          service_control('delete') if service_exists?
+
+          svnserve_dir = File.expand_path("svnserve")
+          FileUtils.mkdir_p(svnserve_dir)
+          at_exit do
+            service_control('stop') unless service_stopped?
+            service_control('delete') if service_exists?
+            FileUtils.rm_rf(svnserve_dir)
+          end
+          trap("INT") do
+            service_control('stop') unless service_stopped?
+            service_control('delete') if service_exists?
+            FileUtils.rm_rf(svnserve_dir)
+          end
+          
+          config = SetupEnvironment.gen_make_opts
+          apr_version_include = Pathname.new(config["--with-apr"])  +
+              'include' + 'apr_version.h'
+          %r'^\s*#define\s+APR_MAJOR_VERSION\s+(\d+)' =~ apr_version_include.read
+          apr_major_version = $1 == '0' ? '' : "-#{$1}"
+          
+          targets = %W(svnserve.exe libsvn_subr-1.dll libsvn_repos-1.dll
+                       libsvn_fs-1.dll libsvn_delta-1.dll
+                       libaprutil#{apr_major_version}.dll 
+                       libapr#{apr_major_version}.dll 
+                       libapriconv#{apr_major_version}.dll
+                       libdb44.dll libdb44d.dll)
+          ENV["PATH"].split(";").each do |path|
+            found_targets = []
+            targets.each do |target|
+              target_path = "#{path}\\#{target}"
+              if File.exists?(target_path)
+                found_targets << target
+                FileUtils.cp(target_path, svnserve_dir)
+              end
+            end
+            targets -= found_targets
+            break if targets.empty?
+          end
+          # Remove optional targets instead of raising below.  If they are really
+          # needed, svnserve won't start anyway.
+          targets -= %W[libapriconv#{apr_major_version}.dll]
+          unless targets.empty?
+            raise "can't find libraries to work svnserve: #{targets.join(' ')}"
+          end
+
+          grant_everyone_full_access(svnserve_dir)
+
+          svnserve_path = File.join(svnserve_dir, "svnserve.exe")
+          svnserve_path = svnserve_path.tr(File::SEPARATOR,
+                                           File::ALT_SEPARATOR)
+          svnserve_path = Svnserve.escape_value(svnserve_path)
+
+          root = @full_repos_path.tr(File::SEPARATOR, File::ALT_SEPARATOR)
+
+          args = ["--service", "--root", Svnserve.escape_value(root),
+                  "--listen-host", @svnserve_host,
+                  "--listen-port", @svnserve_port]
+          user = ENV["USERNAME"] || Etc.getlogin
+          service_control('create',
+                          [["binPath", "#{svnserve_path} #{args.join(' ')}"],
+                           ["DisplayName", service_name],
+                           ["type", "own"]])
+        end
+        service_control('start')
+        true
+      end
+
+      def teardown_svnserve
+        service_control('stop') unless service_stopped?
+      end
+
+      def add_pre_revprop_change_hook
+        File.open("#{@repos.pre_revprop_change_hook}.cmd", "w") do |hook|
+          hook.print <<-HOOK
+set REPOS=%1
+set REV=%2
+set USER=%3
+set PROPNAME=%4
+if "%PROPNAME%" == "#{Svn::Core::PROP_REVISION_LOG}" if "%USER%" == "#{@author}" exit 0
+exit 1
+          HOOK
+        end
+      end
+    end
+
+    module SetupEnvironment
+      def setup_test_environment(top_dir, base_dir, ext_dir)
+        @@top_dir = top_dir
+
+        build_type = ENV["BUILD_TYPE"] || "Release"
+
+        FileUtils.mkdir_p(ext_dir)
+
+        relative_base_dir =
+          base_dir.sub(/^#{Regexp.escape(top_dir + File::SEPARATOR)}/, '')
+        build_base_dir = File.join(top_dir, build_type, relative_base_dir)
+
+        dll_dir = File.expand_path(build_base_dir)
+        subversion_dir = File.join(build_base_dir, "..", "..", "..")
+        subversion_dir = File.expand_path(subversion_dir)
+
+        util_name = "util"
+        build_conf = File.join(top_dir, "build.conf")
+        File.open(File.join(ext_dir, "#{util_name}.rb" ), 'w') do |util|
+          setup_dll_wrapper_util(dll_dir, util)
+          add_depended_dll_path_to_dll_wrapper_util(top_dir, build_type, util)
+          add_svn_dll_path_to_dll_wrapper_util(build_conf, subversion_dir, util)
+          setup_dll_wrappers(build_conf, ext_dir, dll_dir, util_name) do |lib|
+            svn_lib_dir = File.join(subversion_dir, "libsvn_#{lib}")
+            util.puts("add_path.call(#{svn_lib_dir.dump})")
+          end
+
+          svnserve_dir = File.join(subversion_dir, "svnserve")
+          util.puts("add_path.call(#{svnserve_dir.dump})")
+        end
+      end
+
+      def gen_make_opts
+        @gen_make_opts ||= begin
+          lines = []
+          gen_make_opts = File.join(@@top_dir, "gen-make.opts")
+          lines = File.read(gen_make_opts).to_a if File.exists?(gen_make_opts)
+          config = Hash.new do |hash, key|
+            if /^--with-(.*)$/ =~ key
+              hash[key] = File.join(@@top_dir, $1)
+            end
+          end
+       
+          lines.each do |line|
+            name, value = line.chomp.split(/\s*=\s*/, 2)
+            if value
+              config[name] = Pathname.new(value).absolute? ?
+                value :
+                File.join(@@top_dir, value)
+            end
+          end
+          config
+        end
+      end
+      module_function :gen_make_opts
+
+      private
+      def setup_dll_wrapper_util(dll_dir, util)
+        libsvn_swig_ruby_dll_dir = File.join(dll_dir, "libsvn_swig_ruby")
+
+        util.puts(<<-EOC)
+paths = ENV["PATH"].split(';')
+add_path = Proc.new do |path|
+  win_path = path.tr(File::SEPARATOR, File::ALT_SEPARATOR)
+  unless paths.include?(win_path)
+    ENV["PATH"] = "\#{win_path};\#{ENV['PATH']}"
+  end
+end
+
+add_path.call(#{dll_dir.dump})
+add_path.call(#{libsvn_swig_ruby_dll_dir.dump})
+EOC
+      end
+      
+      def add_depended_dll_path_to_dll_wrapper_util(top_dir, build_type, util)
+        [
+         ["apr", build_type],
+         ["apr-util", build_type],
+         ["apr-iconv", build_type],
+         ["berkeley-db", "bin"],
+         ["libintl", "bin"],
+         ["sasl", "lib"],
+        ].each do |lib, sub_dir|
+          lib_dir = Pathname.new(gen_make_opts["--with-#{lib}"])
+          dll_dir = lib_dir + sub_dir
+          dll_dir = dll_dir.expand_path
+          util.puts("add_path.call(#{dll_dir.to_s.dump})")
+        end
+      end
+
+      def add_svn_dll_path_to_dll_wrapper_util(build_conf, subversion_dir, util)
+        File.open(build_conf) do |f|
+          f.each do |line|
+            if /^\[(libsvn_.+)\]\s*$/ =~ line
+              lib_name = $1
+              lib_dir = File.join(subversion_dir, lib_name)
+              util.puts("add_path.call(#{lib_dir.dump})")
+            end
+          end
+        end
+      end
+
+      def setup_dll_wrappers(build_conf, ext_dir, dll_dir, util_name)
+        File.open(build_conf) do |f|
+          f.each do |line|
+            if /^\[swig_(.+)\]\s*$/ =~ line
+              lib_name = $1
+              File.open(File.join(ext_dir, "#{lib_name}.rb" ), 'w') do |rb|
+                rb.puts(<<-EOC)
+require File.join(File.dirname(__FILE__), #{util_name.dump})
+require File.join(#{dll_dir.dump}, File.basename(__FILE__, '.rb')) + '.so'
+EOC
+              end
+
+              yield(lib_name)
+            end
+          end
+        end
+      end
+    end
+  end
+end