diff options
| author | Fred Baksik <frodak17@gmail.com> | 2019-01-09 04:52:12 (GMT) |
|---|---|---|
| committer | Fred Baksik <frodak17@gmail.com> | 2019-01-16 15:42:08 (GMT) |
| commit | 21ab58d3f8782e80145f14eb6e72926c9d17afc6 (patch) | |
| tree | 04b73d0d54cc854bedc8641aa5b7f73677362088 /Tests/GhsMulti/GhsMultiLinkTest/CMakeLists.txt | |
| parent | 72e0c115b771fe9e3f4b5a5b6bd3bcdade77a7cb (diff) | |
| download | CMake-21ab58d3f8782e80145f14eb6e72926c9d17afc6.zip CMake-21ab58d3f8782e80145f14eb6e72926c9d17afc6.tar.gz CMake-21ab58d3f8782e80145f14eb6e72926c9d17afc6.tar.bz2 | |
GHS: Update test suite
-- Allow for testing default toolset settings
If CMake_TEST_GreenHillsMULTI_config is not defined then
just run the GHS tests using defaults.
-- Handle paths that contain spaces
-- Update test suite to use "-non_shared" linker option
Fixes linking issue if GHS is not shipped with shared libraries
-- Other minor cleanup
Diffstat (limited to 'Tests/GhsMulti/GhsMultiLinkTest/CMakeLists.txt')
| -rw-r--r-- | Tests/GhsMulti/GhsMultiLinkTest/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Tests/GhsMulti/GhsMultiLinkTest/CMakeLists.txt b/Tests/GhsMulti/GhsMultiLinkTest/CMakeLists.txt index dfb72ce..da80b51 100644 --- a/Tests/GhsMulti/GhsMultiLinkTest/CMakeLists.txt +++ b/Tests/GhsMulti/GhsMultiLinkTest/CMakeLists.txt @@ -37,7 +37,7 @@ if (RUN_TEST STREQUAL "NO_FLAGS") endif() else() unset(fileName CACHE) - find_file (fileName exe1.gpj + find_file(fileName exe1.gpj ${CMAKE_CURRENT_BINARY_DIR}/link_build ${CMAKE_CURRENT_BINARY_DIR}/link_build/exe1 ) @@ -50,12 +50,12 @@ else() -lcsl1 csl2 -clinkexe1 -clinkexe2 -special-lib2-public-link) - foreach( opt IN LISTS expected_flags ) + foreach(opt IN LISTS expected_flags) string(FIND "${fileText}" "${opt}" opt_found) if ( opt_found EQUAL -1 ) message(SEND_ERROR "Could not find: ${opt}") endif() - endforeach(opt) + endforeach() unset(fileName CACHE) find_file (fileName lib1.gpj @@ -67,12 +67,12 @@ else() set(expected_flags -clinkexeA1 -clinkexeA2 -static-lib-flags1 -static-lib-flags2) - foreach( opt IN LISTS expected_flags ) + foreach(opt IN LISTS expected_flags) string(FIND "${fileText}" "${opt}" opt_found) - if ( opt_found EQUAL -1 ) + if (opt_found EQUAL -1) message(SEND_ERROR "Could not find: ${opt}") endif() - endforeach(opt) + endforeach() unset(fileName CACHE) find_file (fileName lib2.gpj @@ -83,10 +83,10 @@ else() file(STRINGS ${fileName} fileText) set(expected_flags -clinkexeA1 -clinkexeA2) - foreach( opt IN LISTS expected_flags ) + foreach(opt IN LISTS expected_flags) string(FIND "${fileText}" "${opt}" opt_found) if ( opt_found EQUAL -1 ) message(SEND_ERROR "Could not find: ${opt}") endif() - endforeach(opt) + endforeach() endif() |