Kouhei Sutou
null+****@clear*****
Thu Oct 11 21:54:07 JST 2012
Kouhei Sutou 2012-10-11 21:54:07 +0900 (Thu, 11 Oct 2012) New Revision: 77d309c584ba4f6d2cf5d8de555cb3c805f57371 https://github.com/groonga/groonga/commit/77d309c584ba4f6d2cf5d8de555cb3c805f57371 Log: test command: use new directive syntax # NAME ARGUMENTS... | \./ #@NAME ARGUMENTS... Modified files: test/command/fixture/geo/taiyaki/init.grn test/command/fixture/suggest/rurema/init.grn test/command/suite/geo/taiyaki/in-circle.test test/command/suite/geo/taiyaki/in-rectangle-long-latitude.test test/command/suite/select/filter/geo_in_circle/ellip_with_index.test test/command/suite/select/filter/geo_in_circle/ellip_without_index.test test/command/suite/select/filter/geo_in_circle/ellipsoid_with_index.test test/command/suite/select/filter/geo_in_circle/ellipsoid_without_index.test test/command/suite/select/filter/geo_in_circle/rect_with_index.test test/command/suite/select/filter/geo_in_circle/rect_without_index.test test/command/suite/select/filter/geo_in_circle/rectangle_with_index.test test/command/suite/select/filter/geo_in_circle/rectangle_without_index.test test/command/suite/select/filter/geo_in_circle/sphere_with_index.test test/command/suite/select/filter/geo_in_circle/sphere_without_index.test test/command/suite/select/filter/geo_in_circle/sphr_with_index.test test/command/suite/select/filter/geo_in_circle/sphr_without_index.test test/command/suite/select/filter/geo_in_circle/with_index.test test/command/suite/select/filter/geo_in_circle/without_index.test test/command/suite/select/filter/invalid/function_call/temporary_table.test test/command/suite/suggest/complete/coocurrence.test test/command/suite/suggest/complete/prefix-rk-search-hiragana-and-romaji.test test/command/suite/suggest/complete/prefix-rk-search-hiragana.test test/command/suite/suggest/complete/prefix-rk-search-katakana.test test/command/suite/suggest/complete/prefix-rk-search-romaji.test test/command/suite/suggest/complete/prefix-rk-search-thrshold-found.test test/command/suite/suggest/complete/prefix-rk-search-thrshold-not-found.test test/command/suite/suggest/complete/prefix-search-downcase.test test/command/suite/suggest/complete/prefix-search-no.test test/command/suite/suggest/complete/prefix-search-threshold-found.test test/command/suite/suggest/complete/prefix-search-threshold-not-found.test test/command/suite/suggest/complete/prefix-search-upcase.test test/command/suite/suggest/complete/prefix-search-yes.test test/command/suite/suggest/correct/coocurrence.test test/command/suite/suggest/correct/similar-search-no.test test/command/suite/suggest/correct/similar-search.test test/command/suite/suggest/suggest/coocurrence.test test/command/suite/suggest/suggest/learn-duplicated.test Modified: test/command/fixture/geo/taiyaki/init.grn (+7 -7) =================================================================== --- test/command/fixture/geo/taiyaki/init.grn 2012-10-11 19:05:25 +0900 (3acb375) +++ test/command/fixture/geo/taiyaki/init.grn 2012-10-11 21:54:07 +0900 (93d7616) @@ -1,7 +1,7 @@ -# disable-logging -# include fixture/geo/taiyaki/ddl.grn -# include fixture/geo/taiyaki/areas.grn -# include fixture/geo/taiyaki/categories.grn -# include fixture/geo/taiyaki/shops.grn -# include fixture/geo/taiyaki/synonyms.grn -# enable-logging +#@disable-logging +#@include fixture/geo/taiyaki/ddl.grn +#@include fixture/geo/taiyaki/areas.grn +#@include fixture/geo/taiyaki/categories.grn +#@include fixture/geo/taiyaki/shops.grn +#@include fixture/geo/taiyaki/synonyms.grn +#@enable-logging Modified: test/command/fixture/suggest/rurema/init.grn (+5 -5) =================================================================== --- test/command/fixture/suggest/rurema/init.grn 2012-10-11 19:05:25 +0900 (2a53e60) +++ test/command/fixture/suggest/rurema/init.grn 2012-10-11 21:54:07 +0900 (feb4719) @@ -1,5 +1,5 @@ -# disable-logging -# suggest-create-dataset rurema -# include fixture/suggest/rurema/items.grn -# include fixture/suggest/rurema/learn.grn -# enable-logging +#@disable-logging +#@suggest-create-dataset rurema +#@include fixture/suggest/rurema/items.grn +#@include fixture/suggest/rurema/learn.grn +#@enable-logging Modified: test/command/suite/geo/taiyaki/in-circle.test (+1 -1) =================================================================== --- test/command/suite/geo/taiyaki/in-circle.test 2012-10-11 19:05:25 +0900 (5c79486) +++ test/command/suite/geo/taiyaki/in-circle.test 2012-10-11 21:54:07 +0900 (c8d23f8) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops \ --sortby '+_score, +name' \ Modified: test/command/suite/geo/taiyaki/in-rectangle-long-latitude.test (+1 -1) =================================================================== --- test/command/suite/geo/taiyaki/in-rectangle-long-latitude.test 2012-10-11 19:05:25 +0900 (9d18c1c) +++ test/command/suite/geo/taiyaki/in-rectangle-long-latitude.test 2012-10-11 21:54:07 +0900 (28c9d87) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops \ --sortby '+_score, +name' \ Modified: test/command/suite/select/filter/geo_in_circle/ellip_with_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/ellip_with_index.test 2012-10-11 19:05:25 +0900 (0063742) +++ test/command/suite/select/filter/geo_in_circle/ellip_with_index.test 2012-10-11 21:54:07 +0900 (a3aa0fa) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/geo_in_circle/ellip_without_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/ellip_without_index.test 2012-10-11 19:05:25 +0900 (159afd0) +++ test/command/suite/select/filter/geo_in_circle/ellip_without_index.test 2012-10-11 21:54:07 +0900 (645e68d) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/geo_in_circle/ellipsoid_with_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/ellipsoid_with_index.test 2012-10-11 19:05:25 +0900 (dd12660) +++ test/command/suite/select/filter/geo_in_circle/ellipsoid_with_index.test 2012-10-11 21:54:07 +0900 (57cc913) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/geo_in_circle/ellipsoid_without_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/ellipsoid_without_index.test 2012-10-11 19:05:25 +0900 (1363b5b) +++ test/command/suite/select/filter/geo_in_circle/ellipsoid_without_index.test 2012-10-11 21:54:07 +0900 (47c4fc3) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/geo_in_circle/rect_with_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/rect_with_index.test 2012-10-11 19:05:25 +0900 (1a8326e) +++ test/command/suite/select/filter/geo_in_circle/rect_with_index.test 2012-10-11 21:54:07 +0900 (06b1ae2) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/geo_in_circle/rect_without_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/rect_without_index.test 2012-10-11 19:05:25 +0900 (c0e2076) +++ test/command/suite/select/filter/geo_in_circle/rect_without_index.test 2012-10-11 21:54:07 +0900 (7d494fc) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/geo_in_circle/rectangle_with_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/rectangle_with_index.test 2012-10-11 19:05:25 +0900 (4c81615) +++ test/command/suite/select/filter/geo_in_circle/rectangle_with_index.test 2012-10-11 21:54:07 +0900 (fbc4ed7) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/geo_in_circle/rectangle_without_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/rectangle_without_index.test 2012-10-11 19:05:25 +0900 (5ae85ab) +++ test/command/suite/select/filter/geo_in_circle/rectangle_without_index.test 2012-10-11 21:54:07 +0900 (dc9b938) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/geo_in_circle/sphere_with_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/sphere_with_index.test 2012-10-11 19:05:25 +0900 (6b6eb40) +++ test/command/suite/select/filter/geo_in_circle/sphere_with_index.test 2012-10-11 21:54:07 +0900 (a414ea1) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/geo_in_circle/sphere_without_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/sphere_without_index.test 2012-10-11 19:05:25 +0900 (5266d1d) +++ test/command/suite/select/filter/geo_in_circle/sphere_without_index.test 2012-10-11 21:54:07 +0900 (46cdc55) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/geo_in_circle/sphr_with_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/sphr_with_index.test 2012-10-11 19:05:25 +0900 (1f57030) +++ test/command/suite/select/filter/geo_in_circle/sphr_with_index.test 2012-10-11 21:54:07 +0900 (758f550) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/geo_in_circle/sphr_without_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/sphr_without_index.test 2012-10-11 19:05:25 +0900 (a61d503) +++ test/command/suite/select/filter/geo_in_circle/sphr_without_index.test 2012-10-11 21:54:07 +0900 (de003f4) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/geo_in_circle/with_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/with_index.test 2012-10-11 19:05:25 +0900 (734ca45) +++ test/command/suite/select/filter/geo_in_circle/with_index.test 2012-10-11 21:54:07 +0900 (c8e2688) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/geo_in_circle/without_index.test (+1 -1) =================================================================== --- test/command/suite/select/filter/geo_in_circle/without_index.test 2012-10-11 19:05:25 +0900 (43b434f) +++ test/command/suite/select/filter/geo_in_circle/without_index.test 2012-10-11 21:54:07 +0900 (26de1f7) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops --sortby '+_score, +name' \ --output_columns 'name, _score, location' \ Modified: test/command/suite/select/filter/invalid/function_call/temporary_table.test (+1 -1) =================================================================== --- test/command/suite/select/filter/invalid/function_call/temporary_table.test 2012-10-11 19:05:25 +0900 (3e35696) +++ test/command/suite/select/filter/invalid/function_call/temporary_table.test 2012-10-11 21:54:07 +0900 (91d0fae) @@ -1,4 +1,4 @@ -# include fixture/geo/taiyaki/init.grn +#@include fixture/geo/taiyaki/init.grn select Shops \ --output_columns 'name' \ Modified: test/command/suite/suggest/complete/coocurrence.test (+1 -1) =================================================================== --- test/command/suite/suggest/complete/coocurrence.test 2012-10-11 19:05:25 +0900 (17d941a) +++ test/command/suite/suggest/complete/coocurrence.test 2012-10-11 21:54:07 +0900 (bd94faa) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/complete/prefix-rk-search-hiragana-and-romaji.test (+1 -1) =================================================================== --- test/command/suite/suggest/complete/prefix-rk-search-hiragana-and-romaji.test 2012-10-11 19:05:25 +0900 (8cb912c) +++ test/command/suite/suggest/complete/prefix-rk-search-hiragana-and-romaji.test 2012-10-11 21:54:07 +0900 (1d8c602) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/complete/prefix-rk-search-hiragana.test (+1 -1) =================================================================== --- test/command/suite/suggest/complete/prefix-rk-search-hiragana.test 2012-10-11 19:05:25 +0900 (071ff4a) +++ test/command/suite/suggest/complete/prefix-rk-search-hiragana.test 2012-10-11 21:54:07 +0900 (570f8bd) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/complete/prefix-rk-search-katakana.test (+1 -1) =================================================================== --- test/command/suite/suggest/complete/prefix-rk-search-katakana.test 2012-10-11 19:05:25 +0900 (4a6308b) +++ test/command/suite/suggest/complete/prefix-rk-search-katakana.test 2012-10-11 21:54:07 +0900 (02cf3a1) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/complete/prefix-rk-search-romaji.test (+1 -1) =================================================================== --- test/command/suite/suggest/complete/prefix-rk-search-romaji.test 2012-10-11 19:05:25 +0900 (4e45e8d) +++ test/command/suite/suggest/complete/prefix-rk-search-romaji.test 2012-10-11 21:54:07 +0900 (85ef53a) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/complete/prefix-rk-search-thrshold-found.test (+1 -1) =================================================================== --- test/command/suite/suggest/complete/prefix-rk-search-thrshold-found.test 2012-10-11 19:05:25 +0900 (ebb09b5) +++ test/command/suite/suggest/complete/prefix-rk-search-thrshold-found.test 2012-10-11 21:54:07 +0900 (e8256b9) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/complete/prefix-rk-search-thrshold-not-found.test (+1 -1) =================================================================== --- test/command/suite/suggest/complete/prefix-rk-search-thrshold-not-found.test 2012-10-11 19:05:25 +0900 (c568d5f) +++ test/command/suite/suggest/complete/prefix-rk-search-thrshold-not-found.test 2012-10-11 21:54:07 +0900 (3aae51e) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/complete/prefix-search-downcase.test (+1 -1) =================================================================== --- test/command/suite/suggest/complete/prefix-search-downcase.test 2012-10-11 19:05:25 +0900 (d59fc44) +++ test/command/suite/suggest/complete/prefix-search-downcase.test 2012-10-11 21:54:07 +0900 (e621989) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/complete/prefix-search-no.test (+1 -1) =================================================================== --- test/command/suite/suggest/complete/prefix-search-no.test 2012-10-11 19:05:25 +0900 (6b65537) +++ test/command/suite/suggest/complete/prefix-search-no.test 2012-10-11 21:54:07 +0900 (450e8c6) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/complete/prefix-search-threshold-found.test (+1 -1) =================================================================== --- test/command/suite/suggest/complete/prefix-search-threshold-found.test 2012-10-11 19:05:25 +0900 (dd6e6b9) +++ test/command/suite/suggest/complete/prefix-search-threshold-found.test 2012-10-11 21:54:07 +0900 (deafd92) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/complete/prefix-search-threshold-not-found.test (+1 -1) =================================================================== --- test/command/suite/suggest/complete/prefix-search-threshold-not-found.test 2012-10-11 19:05:25 +0900 (e45033c) +++ test/command/suite/suggest/complete/prefix-search-threshold-not-found.test 2012-10-11 21:54:07 +0900 (16c3494) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/complete/prefix-search-upcase.test (+1 -1) =================================================================== --- test/command/suite/suggest/complete/prefix-search-upcase.test 2012-10-11 19:05:25 +0900 (f6ae813) +++ test/command/suite/suggest/complete/prefix-search-upcase.test 2012-10-11 21:54:07 +0900 (c285763) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/complete/prefix-search-yes.test (+1 -1) =================================================================== --- test/command/suite/suggest/complete/prefix-search-yes.test 2012-10-11 19:05:25 +0900 (5be375b) +++ test/command/suite/suggest/complete/prefix-search-yes.test 2012-10-11 21:54:07 +0900 (f57c5ed) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/correct/coocurrence.test (+1 -1) =================================================================== --- test/command/suite/suggest/correct/coocurrence.test 2012-10-11 19:05:25 +0900 (47c2b0b) +++ test/command/suite/suggest/correct/coocurrence.test 2012-10-11 21:54:07 +0900 (18087fe) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/correct/similar-search-no.test (+3 -3) =================================================================== --- test/command/suite/suggest/correct/similar-search-no.test 2012-10-11 19:05:25 +0900 (1e26167) +++ test/command/suite/suggest/correct/similar-search-no.test 2012-10-11 21:54:07 +0900 (ff8fc60) @@ -1,6 +1,6 @@ -# disable-logging -# suggest-create-dataset query -# enable-logging +#@disable-logging +#@suggest-create-dataset query +#@enable-logging load --table event_query --each 'suggest_preparer(_id, type, item, sequence, time, pair_query)' [ Modified: test/command/suite/suggest/correct/similar-search.test (+1 -1) =================================================================== --- test/command/suite/suggest/correct/similar-search.test 2012-10-11 19:05:25 +0900 (906e546) +++ test/command/suite/suggest/correct/similar-search.test 2012-10-11 21:54:07 +0900 (30159f4) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/suggest/coocurrence.test (+1 -1) =================================================================== --- test/command/suite/suggest/suggest/coocurrence.test 2012-10-11 19:05:25 +0900 (4149103) +++ test/command/suite/suggest/suggest/coocurrence.test 2012-10-11 21:54:07 +0900 (00bd329) @@ -1,4 +1,4 @@ -# include fixture/suggest/rurema/init.grn +#@include fixture/suggest/rurema/init.grn suggest \ --table item_rurema \ Modified: test/command/suite/suggest/suggest/learn-duplicated.test (+3 -3) =================================================================== --- test/command/suite/suggest/suggest/learn-duplicated.test 2012-10-11 19:05:25 +0900 (3caad5f) +++ test/command/suite/suggest/suggest/learn-duplicated.test 2012-10-11 21:54:07 +0900 (ad5dfe7) @@ -1,6 +1,6 @@ -# disable-logging -# suggest-create-dataset query -# enable-logging +#@disable-logging +#@suggest-create-dataset query +#@enable-logging load --table event_query --each 'suggest_preparer(_id, type, item, sequence, time, pair_query)' [ -------------- next part -------------- HTML����������������������������... Download