Merge pull request grpc#16921 from apolcyn/move_package_options_test

Move ruby test's package_options.proto file to ruby-specific directory
tmatsuo · Oct 19, 2018 · da5d02f · da5d02f
2 parents 0c4f412 + f6e8417
commit da5d02f
Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/proto/grpc/testing/package_options.proto → ...odegen/grpc/testing/package_options.proto b/src/proto/grpc/testing/package_options.proto → ...odegen/grpc/testing/package_options.proto
diff --git a/src/ruby/spec/pb/codegen/package_option_spec.rb b/src/ruby/spec/pb/codegen/package_option_spec.rb
@@ -21,9 +21,8 @@
     fail 'CONFIG env variable unexpectedly unset' unless ENV['CONFIG']
     bins_sub_dir = ENV['CONFIG']
 
-    src_dir = File.join(File.dirname(__FILE__), '..', '..', '..', '..')
-    pb_dir = File.join(src_dir, 'proto')
-    bins_dir = File.join(src_dir, '..', 'bins', bins_sub_dir)
+    pb_dir = File.dirname(__FILE__)
+    bins_dir = File.join('..', '..', '..', '..', '..', 'bins', bins_sub_dir)
 
     plugin = File.join(bins_dir, 'grpc_ruby_plugin')
     protoc = File.join(bins_dir, 'protobuf', 'protoc')