Kouhei Sutou
null+****@clear*****
Thu Jan 23 18:46:53 JST 2014
Kouhei Sutou 2014-01-23 18:46:53 +0900 (Thu, 23 Jan 2014) New Revision: 02b9555f2bd65bf7bd16d3a826d1a1f111b8e323 https://github.com/mroonga/mariadb-sync/commit/02b9555f2bd65bf7bd16d3a826d1a1f111b8e323 Message: Support .result.in Added files: flatten-test-file-path.rb Modified files: sync.sh Renamed files: flatten-test-file.rb (from flatten-test.rb) Added: flatten-test-file-path.rb (+27 -0) 100755 =================================================================== --- /dev/null +++ flatten-test-file-path.rb 2014-01-23 18:46:53 +0900 (9a5449a) @@ -0,0 +1,27 @@ +#!/usr/bin/env ruby + +require "English" +require "pathname" +require "fileutils" + +cmakelists_txt = Pathname(ARGV[0]) + +resolved_content = "" +cmakelists_txt.open do |file| + file.each_line do |line| + resolved_line = line.gsub(/(\$\{MRN_TEST_SUITE_DIR\})(\S+)/) do + prefix = $1 + components = $2.split("/") + mode = components.first + targets = components[1..-3] + type = components[-2] + targets << components.last + resolved_path = [mode, type, targets.join("_")].join("/") + prefix + resolved_path + end + resolved_content << resolved_line + end +end +cmakelists_txt.open("w") do |file| + file.print(resolved_content) +end Renamed: flatten-test-file.rb (+1 -1) 98% =================================================================== --- flatten-test.rb 2014-01-23 17:45:19 +0900 (5431eff) +++ flatten-test-file.rb 2014-01-23 18:46:53 +0900 (151c3e3) @@ -65,7 +65,7 @@ base_dir.find do |path| when ".test" next if relative_path.dirname == relative_top_t_dir resolve_include_path(path, relative_path) - when ".result" + when ".result", ".in" next if relative_path.dirname == relative_top_r_dir else next Modified: sync.sh (+4 -2) =================================================================== --- sync.sh 2014-01-23 17:45:19 +0900 (28d3926) +++ sync.sh 2014-01-23 18:46:53 +0900 (0609421) @@ -75,10 +75,12 @@ update_mroonga() mkdir -p "${bundled_mroonga_dir}" cp -a * "${bundled_mroonga_dir}/" rm -rf "${bundled_mroonga_dir}/doc/" - ruby "${base_dir}/flatten-test.rb" \ + ruby "${base_dir}/flatten-test-file.rb" \ "${bundled_mroonga_dir}/mysql-test/mroonga/storage" - ruby "${base_dir}/flatten-test.rb" \ + ruby "${base_dir}/flatten-test-file.rb" \ "${bundled_mroonga_dir}/mysql-test/mroonga/wrapper" + ruby "${base_dir}/flatten-test-file-path.rb" \ + "${bundled_mroonga_dir}/CMakeLists.txt" } update_groonga() -------------- next part -------------- HTML����������������������������...Download