diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-01-13 11:42:18 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-01-13 11:42:18 -0800 |
| commit | b70206fe52ee6509f3f965bf2a95b2cbd321088d (patch) | |
| tree | fa59a43171854465c89af72734d45350070b7366 /test/core | |
| parent | 295a7ce511f1a2145f70942f826d0e225c00ba62 (diff) | |
| parent | 7149ca6bd0ce73a08fa512415d3f641a06a15a75 (diff) | |
Merge branch 'master' into release-0_12_master_merge
Diffstat (limited to 'test/core')
| -rw-r--r-- | test/core/end2end/end2end_nosec_tests.c | 2 | ||||
| -rw-r--r-- | test/core/end2end/end2end_tests.c | 2 | ||||
| -rw-r--r-- | test/core/iomgr/tcp_posix_test.c | 2 | ||||
| -rw-r--r-- | test/core/security/jwt_verifier_test.c | 2 | ||||
| -rw-r--r-- | test/core/support/cpu_test.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/test/core/end2end/end2end_nosec_tests.c b/test/core/end2end/end2end_nosec_tests.c index d9df5fd7f0..9ff46d62e4 100644 --- a/test/core/end2end/end2end_nosec_tests.c +++ b/test/core/end2end/end2end_nosec_tests.c @@ -258,7 +258,7 @@ void grpc_end2end_tests(int argc, char **argv, trailing_metadata(config); continue; } - gpr_log(GPR_DEBUG, "not a test: '%%s'", argv[i]); + gpr_log(GPR_DEBUG, "not a test: '%s'", argv[i]); abort(); } } diff --git a/test/core/end2end/end2end_tests.c b/test/core/end2end/end2end_tests.c index 7b1471eb89..397ff446a9 100644 --- a/test/core/end2end/end2end_tests.c +++ b/test/core/end2end/end2end_tests.c @@ -264,7 +264,7 @@ void grpc_end2end_tests(int argc, char **argv, trailing_metadata(config); continue; } - gpr_log(GPR_DEBUG, "not a test: '%%s'", argv[i]); + gpr_log(GPR_DEBUG, "not a test: '%s'", argv[i]); abort(); } } diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index b59ba1014b..e0136b3cd7 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index 9f37e0374c..f396398cef 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/test/core/support/cpu_test.c b/test/core/support/cpu_test.c index a5c52442ad..da16f13fd8 100644 --- a/test/core/support/cpu_test.c +++ b/test/core/support/cpu_test.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |