Use firmware-test-builder in existing tests

Use firmware-test-builder for driving component-test and
ts-service-test.

Change-Id: I5a728395eaa0459188fb92f1355f3d62e86a65ca
Signed-off-by: Imre Kis <imre.kis@arm.com>
diff --git a/deployments/component-test/arm-linux/CMakeLists.txt b/deployments/component-test/arm-linux/CMakeLists.txt
index 4b3353c..d96a793 100644
--- a/deployments/component-test/arm-linux/CMakeLists.txt
+++ b/deployments/component-test/arm-linux/CMakeLists.txt
@@ -19,6 +19,15 @@
 add_executable(component-test)
 target_include_directories(component-test PRIVATE "${TOP_LEVEL_INCLUDE_DIRS}")
 
+add_components(
+	TARGET "component-test"
+	BASE_DIR ${TS_ROOT}
+	COMPONENTS   "components/app/test-runner"
+)
+
+include(${TS_ROOT}/external/CppUTest/CppUTest.cmake)
+target_link_libraries(component-test PRIVATE CppUTest)
+
 #-------------------------------------------------------------------------------
 #  Extend with components that are common across all deployments of
 #  component-test