Add COMPONENT_TEST_DIR variable (Merge from upstream).
Merge pull request #745 from pyhalov/test_dir

Add COMPONENT_TEST_DIR variable (Merge from upstream).