null+****@clear*****
null+****@clear*****
2012年 5月 18日 (金) 16:35:53 JST
HAYASHI Kentaro 2012-05-18 16:35:53 +0900 (Fri, 18 May 2012)
New Revision: 3d1dc8185d202170db9be4347d665d9db20f2e97
Log:
test: add direction as part of test file path
Modified files:
test/function/tools/geo/generate-grntest-data.rb
Modified: test/function/tools/geo/generate-grntest-data.rb (+16 -5)
===================================================================
--- test/function/tools/geo/generate-grntest-data.rb 2012-05-18 16:28:56 +0900 (3d9fe79)
+++ test/function/tools/geo/generate-grntest-data.rb 2012-05-18 16:35:53 +0900 (5e063c2)
@@ -484,6 +484,8 @@ if __FILE__ == $0
type = grndata.point_or_line
+ direction = grndata.direction
+
filename = grndata.generate_filename
if OPTS.has_key?(:file_name)
@@ -491,8 +493,11 @@ if __FILE__ == $0
if OPTS.has_key?(:verbose)
puts(line)
end
- # show new generated filename
- puts("#{type_longitude}/#{quadrant}/#{type}/#{filename}")
+ if type == "line" then
+ puts("#{type_longitude}/#{quadrant}/#{type}/#{direction}/#{filename}")
+ else
+ puts("#{type_longitude}/#{quadrant}/#{type}/#{filename}")
+ end
elsif OPTS.has_key?(:csv_data)
puts(grndata.generate_new_data(line, type_longitude, quadrant, type, filename))
elsif OPTS.has_key?(:test)
@@ -505,9 +510,15 @@ if __FILE__ == $0
dottest = grndata.generate_test_data(app_type)
if filename and filename != ""
- testname = sprintf("%s/%s/%s/%s%s",
- type_longitude, quadrant, type,
- file_prefix, File.basename(filename))
+ if type == "line" then
+ testname = sprintf("%s/%s/%s/%s/%s%s",
+ type_longitude, quadrant, type, direction,
+ file_prefix, File.basename(filename))
+ else
+ testname = sprintf("%s/%s/%s/%s%s",
+ type_longitude, quadrant, type,
+ file_prefix, File.basename(filename))
+ end
else
exit 1
end