Skip to content

Commit f40c656

Browse files
committed
Fix CI checks
1 parent f3fe564 commit f40c656

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,8 +452,7 @@ jobs:
452452
run: |
453453
sudo ./ci/setup_grpc.sh
454454
./ci/do_ci.sh cmake.exporter.otprotocol.test
455-
- name: generate test cert
456-
- name: generate test cert
455+
- name: generate test cert
457456
env:
458457
CFSSL_VERSION: 1.6.3
459458
run: |

functional/otlp/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ include_directories(${CMAKE_SOURCE_DIR}/exporters/otlp/include)
66
if(WITH_OTLP_GRPC)
77
add_executable(func_otlp_grpc func_grpc_main.cc)
88
target_link_libraries(func_otlp_grpc ${CMAKE_THREAD_LIBS_INIT}
9-
opentelemetry_trace
10-
opentelemetry_exporter_otlp_grpc)
9+
opentelemetry_trace opentelemetry_exporter_otlp_grpc)
1110
endif()
1211

1312
if(WITH_OTLP_HTTP)
1413
add_executable(func_otlp_http func_http_main.cc)
1514
target_link_libraries(func_otlp_http ${CMAKE_THREAD_LIBS_INIT}
16-
opentelemetry_trace
17-
opentelemetry_exporter_otlp_http)
15+
opentelemetry_trace opentelemetry_exporter_otlp_http)
1816
endif()

functional/otlp/func_grpc_main.cc

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -326,11 +326,14 @@ int test_mtls_no_client_cert();
326326
int test_mtls_no_client_key();
327327
int test_mtls_wrong_client_key();
328328

329-
static const test_case all_tests[] = {{"mtls-ok", test_mtls_ok},
330-
{"mtls-no-ca-cert", test_mtls_no_ca_cert},
331-
{"mtls-no-client-cert", test_mtls_no_client_cert},
332-
{"mtls-no-client-key", test_mtls_no_client_key},
333-
{"", nullptr}};
329+
static const test_case all_tests[] = {
330+
#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
331+
{"mtls-ok", test_mtls_ok},
332+
{"mtls-no-ca-cert", test_mtls_no_ca_cert},
333+
{"mtls-no-client-cert", test_mtls_no_client_cert},
334+
{"mtls-no-client-key", test_mtls_no_client_key},
335+
#endif // ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
336+
{"", nullptr}};
334337

335338
void list_test_cases()
336339
{
@@ -454,6 +457,7 @@ int expect_export_failed()
454457
return TEST_FAILED;
455458
}
456459

460+
#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
457461
int test_mtls_ok()
458462
{
459463
otlp::OtlpGrpcExporterOptions opts;
@@ -586,3 +590,4 @@ int test_mtls_no_client_key()
586590

587591
return expect_connection_failed();
588592
}
593+
#endif // ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW

functional/otlp/run_test_mode.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ export CERT_DIR=../cert
3030

3131
export TEST_BIN_DIR=${BUILD_DIR}/functional/otlp/
3232

33+
[ ! -f "${TEST_BIN_DIR}/${TEST_EXECUTABLE}" ] && echo "${TEST_EXECUTABLE} not built in this configuration" && exit 0
34+
3335
${TEST_BIN_DIR}/${TEST_EXECUTABLE} --list > test_list.txt
3436

3537
export TEST_FULL_NAME=""

0 commit comments

Comments
 (0)