Fix creds path

pull/5964/head
Craig Tiller 9 years ago
parent ffae43c98c
commit 1796f87702
  1. 2
      tools/http2_interop/http2interop_test.go
  2. 4
      tools/run_tests/run_tests.py

@ -49,7 +49,7 @@ func InteropCtx(t *testing.T) *HTTP2InteropCtx {
if ctx.UseTestCa {
// It would be odd if useTestCa was true, but not useTls. meh
certData, err := ioutil.ReadFile("src/core/tsi/test_creds/ca.pem")
certData, err := ioutil.ReadFile("src/core/lib/tsi/test_creds/ca.pem")
if err != nil {
t.Fatal(err)
}

@ -183,7 +183,7 @@ class CLanguage(object):
shortname='%s:%s' % (binary, test),
cpu_cost=target['cpu_cost'],
environ={'GRPC_DEFAULT_SSL_ROOTS_FILE_PATH':
_ROOT + '/src/core/tsi/test_creds/ca.pem'}))
_ROOT + '/src/core/lib/tsi/test_creds/ca.pem'}))
else:
cmdline = [binary] + target['args']
out.append(self.config.job_spec(cmdline, [binary],
@ -191,7 +191,7 @@ class CLanguage(object):
cpu_cost=target['cpu_cost'],
flaky=target.get('flaky', False),
environ={'GRPC_DEFAULT_SSL_ROOTS_FILE_PATH':
_ROOT + '/src/core/tsi/test_creds/ca.pem'}))
_ROOT + '/src/core/lib/tsi/test_creds/ca.pem'}))
elif self.args.regex == '.*' or self.platform == 'windows':
print '\nWARNING: binary not found, skipping', binary
return sorted(out)

Loading…
Cancel
Save