fix tests expecting TOOLCHAIN_ID_PATH as top dir

- fix test create_dependency_entry - fix test create_deps_info - fix test get_package_deps - fix test get_package_deps_recurse - fix test register_dependency
Kustov-Ilya · Aug 8, 2017 · 042e6f6 · 042e6f6
1 parent c88b938
commit 042e6f6
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 44 deletions.
diff --git a/tests/hunter_create_dependency_entry/CMakeLists.txt b/tests/hunter_create_dependency_entry/CMakeLists.txt
@@ -8,21 +8,21 @@ project(TestModuleHunterCreateDependencyEntry)
 
 include(hunter_create_dependency_entry)
 
-set(toolchain_id "${CMAKE_CURRENT_BINARY_DIR}/toolchain-id")
-set(HUNTER_TOOLCHAIN_ID_PATH "${toolchain_id}")
+set(config_id "${CMAKE_CURRENT_BINARY_DIR}/config-id")
+set(HUNTER_CONFIG_ID_PATH "${config_id}")
 
 ### No cache
-file(REMOVE_RECURSE "${toolchain_id}")
+file(REMOVE_RECURSE "${config_id}")
 
 hunter_create_dependency_entry(PACKAGE "Foo" COMPONENT "" RESULT result)
 if(NOT result STREQUAL "")
   message(FATAL_ERROR "not empty")
 endif()
 
 ### Cache for package
-file(REMOVE_RECURSE "${toolchain_id}")
+file(REMOVE_RECURSE "${config_id}")
 
-set(foo_home "${toolchain_id}/Build/Foo")
+set(foo_home "${config_id}/Build/Foo")
 file(WRITE "${foo_home}/cache.sha1" "Foo-SHA1")
 
 hunter_create_dependency_entry(PACKAGE "Foo" COMPONENT "" RESULT result)
@@ -31,9 +31,9 @@ if(NOT result STREQUAL "Foo Foo-SHA1")
 endif()
 
 ### Cache for package with component
-file(REMOVE_RECURSE "${toolchain_id}")
+file(REMOVE_RECURSE "${config_id}")
 
-set(foo_home "${toolchain_id}/Build/Foo/__Boo")
+set(foo_home "${config_id}/Build/Foo/__Boo")
 file(WRITE "${foo_home}/cache.sha1" "Foo-Boo-SHA1")
 
 hunter_create_dependency_entry(PACKAGE "Foo" COMPONENT "Boo" RESULT result)

diff --git a/tests/hunter_create_deps_info/CMakeLists.txt b/tests/hunter_create_deps_info/CMakeLists.txt
@@ -25,34 +25,34 @@ function(run_check file1)
 endfunction()
 
 ### Test empty
-set(toolchain_id "${CMAKE_CURRENT_BINARY_DIR}/toolchain-id")
+set(config_id "${CMAKE_CURRENT_BINARY_DIR}/config-id")
 set(package_name "Foo")
 set(temp_deps_info "${CMAKE_CURRENT_BINARY_DIR}/deps.info-TEMP")
 
-set(HUNTER_TOOLCHAIN_ID_PATH "${toolchain_id}")
+set(HUNTER_CONFIG_ID_PATH "${config_id}")
 set(HUNTER_PACKAGE_NAME "${package_name}")
 
-set(home "${toolchain_id}/Build/${package_name}")
+set(home "${config_id}/Build/${package_name}")
 file(WRITE "${home}/cache.sha1" "abc")
 
 hunter_create_deps_info("${temp_deps_info}")
 run_check("${CMAKE_CURRENT_LIST_DIR}/empty.txt")
 
 ### Complex
 
-file(REMOVE_RECURSE "${toolchain_id}")
+file(REMOVE_RECURSE "${config_id}")
 
 set(package_name "J")
 set(HUNTER_PACKAGE_NAME "${package_name}")
 
-file(WRITE "${toolchain_id}/Build/A/cache.sha1" "A-SHA1")
-file(WRITE "${toolchain_id}/Build/B/cache.sha1" "B-SHA1")
-file(WRITE "${toolchain_id}/Build/C/cache.sha1" "C-SHA1")
-file(WRITE "${toolchain_id}/Build/D/__E/cache.sha1" "D-E-SHA1")
-file(WRITE "${toolchain_id}/Build/F/__G/cache.sha1" "F-G-SHA1")
-file(WRITE "${toolchain_id}/Build/H/cache.sha1" "H-SHA1")
-file(WRITE "${toolchain_id}/Build/I/cache.sha1" "I-SHA1")
-file(WRITE "${toolchain_id}/Build/J/cache.sha1" "J-SHA1")
+file(WRITE "${config_id}/Build/A/cache.sha1" "A-SHA1")
+file(WRITE "${config_id}/Build/B/cache.sha1" "B-SHA1")
+file(WRITE "${config_id}/Build/C/cache.sha1" "C-SHA1")
+file(WRITE "${config_id}/Build/D/__E/cache.sha1" "D-E-SHA1")
+file(WRITE "${config_id}/Build/F/__G/cache.sha1" "F-G-SHA1")
+file(WRITE "${config_id}/Build/H/cache.sha1" "H-SHA1")
+file(WRITE "${config_id}/Build/I/cache.sha1" "I-SHA1")
+file(WRITE "${config_id}/Build/J/cache.sha1" "J-SHA1")
 
 hunter_register_dependency(
     PACKAGE "J"

diff --git a/tests/hunter_get_package_deps/CMakeLists.txt b/tests/hunter_get_package_deps/CMakeLists.txt
@@ -9,11 +9,11 @@ project(TestModuleHunterGetPackageDeps)
 include(hunter_get_package_deps)
 
 set(package_name "Foo")
-set(toolchain_id "${CMAKE_CURRENT_BINARY_DIR}/toolchain-id")
+set(config_id "${CMAKE_CURRENT_BINARY_DIR}/config-id")
 
-set(HUNTER_TOOLCHAIN_ID_PATH "${toolchain_id}")
+set(HUNTER_CONFIG_ID_PATH "${config_id}")
 
-set(home_dir "${toolchain_id}/Build/${package_name}")
+set(home_dir "${config_id}/Build/${package_name}")
 set(dependencies_dir "${home_dir}/Dependencies")
 
 function(cleanup)

diff --git a/tests/hunter_get_package_deps_recurse/CMakeLists.txt b/tests/hunter_get_package_deps_recurse/CMakeLists.txt
@@ -9,18 +9,18 @@ project(TestModuleHunterGetPackageDepsRecurse)
 include(hunter_get_package_deps_recurse)
 include(hunter_register_dependency)
 
-set(toolchain_id "${CMAKE_CURRENT_BINARY_DIR}/toolchain-id")
-
-set(HUNTER_TOOLCHAIN_ID_PATH "${toolchain_id}")
-
-file(MAKE_DIRECTORY "${toolchain_id}/Build/A")
-file(MAKE_DIRECTORY "${toolchain_id}/Build/B")
-file(MAKE_DIRECTORY "${toolchain_id}/Build/C")
-file(MAKE_DIRECTORY "${toolchain_id}/Build/D/__E")
-file(MAKE_DIRECTORY "${toolchain_id}/Build/F/__G")
-file(MAKE_DIRECTORY "${toolchain_id}/Build/H")
-file(MAKE_DIRECTORY "${toolchain_id}/Build/I")
-file(MAKE_DIRECTORY "${toolchain_id}/Build/J")
+set(config_id "${CMAKE_CURRENT_BINARY_DIR}/config-id")
+
+set(HUNTER_CONFIG_ID_PATH "${config_id}")
+
+file(MAKE_DIRECTORY "${config_id}/Build/A")
+file(MAKE_DIRECTORY "${config_id}/Build/B")
+file(MAKE_DIRECTORY "${config_id}/Build/C")
+file(MAKE_DIRECTORY "${config_id}/Build/D/__E")
+file(MAKE_DIRECTORY "${config_id}/Build/F/__G")
+file(MAKE_DIRECTORY "${config_id}/Build/H")
+file(MAKE_DIRECTORY "${config_id}/Build/I")
+file(MAKE_DIRECTORY "${config_id}/Build/J")
 
 hunter_register_dependency(
     PACKAGE "J"

diff --git a/tests/hunter_register_dependency/CMakeLists.txt b/tests/hunter_register_dependency/CMakeLists.txt
@@ -8,11 +8,11 @@ project(TestModuleHunterRegisterDependency)
 
 include(hunter_register_dependency)
 
-set(toolchain_id "${CMAKE_CURRENT_BINARY_DIR}/toolchain-id")
-set(HUNTER_TOOLCHAIN_ID_PATH "${toolchain_id}")
+set(config_id "${CMAKE_CURRENT_BINARY_DIR}/config-id")
+set(HUNTER_CONFIG_ID_PATH "${config_id}")
 
-set(expected "${toolchain_id}/Build/Foo/Dependencies/Boo/__dep")
-file(REMOVE_RECURSE "${toolchain_id}")
+set(expected "${config_id}/Build/Foo/Dependencies/Boo/__dep")
+file(REMOVE_RECURSE "${config_id}")
 if(EXISTS "${expected}")
   message(FATAL_ERROR "Exists")
 endif()
@@ -25,8 +25,8 @@ if(NOT EXISTS "${expected}")
   message(FATAL_ERROR "Not exists")
 endif()
 
-set(expected "${toolchain_id}/Build/Foo/__Boo/Dependencies/Bar/__dep")
-file(REMOVE_RECURSE "${toolchain_id}")
+set(expected "${config_id}/Build/Foo/__Boo/Dependencies/Bar/__dep")
+file(REMOVE_RECURSE "${config_id}")
 if(EXISTS "${expected}")
   message(FATAL_ERROR "Exists")
 endif()
@@ -39,8 +39,8 @@ if(NOT EXISTS "${expected}")
   message(FATAL_ERROR "Not exists")
 endif()
 
-set(expected "${toolchain_id}/Build/Foo/Dependencies/Boo/Bar/__dep")
-file(REMOVE_RECURSE "${toolchain_id}")
+set(expected "${config_id}/Build/Foo/Dependencies/Boo/Bar/__dep")
+file(REMOVE_RECURSE "${config_id}")
 if(EXISTS "${expected}")
   message(FATAL_ERROR "Exists")
 endif()
@@ -53,8 +53,8 @@ if(NOT EXISTS "${expected}")
   message(FATAL_ERROR "Not exists")
 endif()
 
-set(expected "${toolchain_id}/Build/Foo/__Boo/Dependencies/Bar/Baz/__dep")
-file(REMOVE_RECURSE "${toolchain_id}")
+set(expected "${config_id}/Build/Foo/__Boo/Dependencies/Bar/Baz/__dep")
+file(REMOVE_RECURSE "${config_id}")
 if(EXISTS "${expected}")
   message(FATAL_ERROR "Exists")
 endif()