Revert moving the singleton test.

Author: marcalff

api/test/CMakeLists.txt

@@ -10,3 +10,7 @@ add_subdirectory(metrics)
 add_subdirectory(logs)
 add_subdirectory(common)
 add_subdirectory(baggage)
+
+if(NOT OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS)
+  add_subdirectory(singleton)
+endif()

sdk/test/singleton/BUILD renamed to api/test/singleton/BUILD

@@ -159,15 +159,15 @@ cc_binary(
 
 #
 # To build this test alone:
-# - bazel build //sdk/test/singleton:singleton_test
-# - bazel build //sdk/test/singleton:component_g
-# - bazel build //sdk/test/singleton:component_h
+# - bazel build //api/test/singleton:singleton_test
+# - bazel build //api/test/singleton:component_g
+# - bazel build //api/test/singleton:component_h
 #
 # Note that singleton_test does not depend on
 # component_g and component_h, on purpose.
 #
 # To run this test:
-# bazel test //sdk/test/singleton:singleton_test
+# bazel test //api/test/singleton:singleton_test
 #
 
 cc_test(
@@ -196,8 +196,6 @@ cc_test(
         "component_e",
         "component_f",
         "//api",
-        "//sdk/src/common:disabled",
-        "//sdk/src/trace",
         "@com_google_googletest//:gtest_main",
     ],
 )

sdk/test/singleton/CMakeLists.txt renamed to api/test/singleton/CMakeLists.txt

@@ -47,8 +47,7 @@ target_link_libraries(
   ${GTEST_BOTH_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT}
   ${CMAKE_DL_LIBS}
-  opentelemetry_api
-  opentelemetry_trace)
+  opentelemetry_api)
 
 gtest_add_tests(
   TARGET singleton_test