diff options
| author |  apolcyn <apolcyn@google.com> | 2018-10-18 17:07:52 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-10-18 17:07:52 -0700 |
| commit | da5d02fb4d41b5bd5996abc78ba025622d1bb25b (patch) | |
| tree | 47adb55a3b5095c5f451844a684af9e12f24f8c7 /src | |
| parent | 0c4f412e13270f187251867526ca64b6eb102830 (diff) | |
| parent | f6e84176270df6012a74686a651a0a397e05ec51 (diff) | |
Merge pull request #16921 from apolcyn/move_package_options_test
Move ruby test's package_options.proto file to ruby-specific directory
Diffstat (limited to 'src')
| -rw-r--r-- | src/ruby/spec/pb/codegen/grpc/testing/package_options.proto (renamed from src/proto/grpc/testing/package_options.proto) | 0 | ||||
| -rw-r--r-- | src/ruby/spec/pb/codegen/package_option_spec.rb | 5 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/proto/grpc/testing/package_options.proto b/src/ruby/spec/pb/codegen/grpc/testing/package_options.proto index e7ecf8c196..e7ecf8c196 100644 --- a/src/proto/grpc/testing/package_options.proto +++ b/src/ruby/spec/pb/codegen/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 index 46d23cd651..0ebd503d79 100644 --- a/src/ruby/spec/pb/codegen/package_option_spec.rb +++ b/src/ruby/spec/pb/codegen/package_option_spec.rb @@ -21,9 +21,8 @@ describe 'Code Generation Options' do 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') |