shelltest

Author: marcalff

.github/workflows/ci.yml

@@ -207,6 +207,8 @@ jobs:
     - name: run cmake clang (maintainer mode, sync)
       run: |
         ./ci/do_ci.sh cmake.maintainer.yaml.test
+    - name: install shelltest
+      run: sudo apt update && sudo apt-get install -y shelltestrunner
     - name: generate test cert
       env:
         CFSSL_VERSION: 1.6.3

functional/configuration/CMakeLists.txt

@@ -7,9 +7,7 @@ endif()
 
 include_directories(${CMAKE_SOURCE_DIR}/sdk/include)
 
-add_executable(
-  otel_configuration_check
-  main.cc)
+add_executable(otel_configuration_check main.cc)
 
 target_link_libraries(
   otel_configuration_check
@@ -23,31 +21,36 @@ target_link_libraries(
 if(WITH_OTLP_HTTP)
   include_directories(${CMAKE_SOURCE_DIR}/exporters/otlp/include)
   add_definitions(-DOTEL_HAVE_OTLP_HTTP)
-  target_link_libraries(otel_configuration_check opentelemetry_otlp_http_builder)
+  target_link_libraries(otel_configuration_check
+                        opentelemetry_otlp_http_builder)
 endif()
 
 if(WITH_OTLP_GRPC)
   include_directories(${CMAKE_SOURCE_DIR}/exporters/otlp/include)
   add_definitions(-DOTEL_HAVE_OTLP_GRPC)
-  target_link_libraries(otel_configuration_check opentelemetry_otlp_grpc_builder)
+  target_link_libraries(otel_configuration_check
+                        opentelemetry_otlp_grpc_builder)
 endif()
 
 if(WITH_OTLP_FILE)
   include_directories(${CMAKE_SOURCE_DIR}/exporters/otlp/include)
   add_definitions(-DOTEL_HAVE_OTLP_FILE)
-  target_link_libraries(otel_configuration_check opentelemetry_otlp_file_builder)
+  target_link_libraries(otel_configuration_check
+                        opentelemetry_otlp_file_builder)
 endif()
 
 if(WITH_ZIPKIN)
   include_directories(${CMAKE_SOURCE_DIR}/exporters/zipkin/include)
   add_definitions(-DOTEL_HAVE_ZIPKIN)
-  target_link_libraries(otel_configuration_check opentelemetry_exporter_zipkin_trace)
+  target_link_libraries(otel_configuration_check
+                        opentelemetry_exporter_zipkin_trace)
 endif()
 
 if(WITH_PROMETHEUS)
   include_directories(${CMAKE_SOURCE_DIR}/exporters/prometheus/include)
   add_definitions(-DOTEL_HAVE_PROMETHEUS)
-  target_link_libraries(otel_configuration_check opentelemetry_exporter_prometheus)
+  target_link_libraries(otel_configuration_check
+                        opentelemetry_exporter_prometheus)
 endif()
 
 if(DEFINED OPENTELEMETRY_BUILD_DLL)

functional/configuration/run_test.sh

@@ -17,13 +17,13 @@ export PATH=${PATH}:${TEST_BIN_DIR}
 
 which otel_configuration_check
 
-otel_configuration_check --help
+# otel_configuration_check --help
 
-which shelltest
+which shelltest || true
 
-shelltest --version
+shelltest --version || true
 
-shelltest --help
+shelltest --help || true
 
 shelltest ./shelltests
 

functional/configuration/shelltests/disabled_empty.test

@@ -1 +1,4 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 otel_configuration_check --yaml shelltests/disabled_empty.yaml

functional/configuration/shelltests/disabled_empty.yaml

@@ -1,2 +1,5 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 format: 0.0
-disabled: 
+disabled:

functional/configuration/shelltests/disabled_false.test

@@ -1 +1,4 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 otel_configuration_check --yaml shelltests/disabled_false.yaml

functional/configuration/shelltests/disabled_false.yaml

@@ -1,2 +1,5 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 format: 0.0
 disabled: false

functional/configuration/shelltests/disabled_true.test

@@ -1 +1,4 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 otel_configuration_check --yaml shelltests/disabled_true.yaml

functional/configuration/shelltests/disabled_true.yaml

@@ -1,2 +1,5 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 format: 0.0
 disabled: true

functional/configuration/shelltests/empty.test

@@ -1 +1,4 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
 otel_configuration_check --yaml shelltests/empty.yaml