Skip to content
Snippets Groups Projects
Commit 9ae33828 authored by Brad King's avatar Brad King
Browse files

Tests: Shorten case names in RunCMake.file-GET_RUNTIME_DEPENDENCIES test

Now that these cases are in a dedicated test we can drop the
`file-GET_RUNTIME_DEPENDENCIES-` prefix from their name.
parent 248d0570
No related branches found
No related tags found
No related merge requests found
Showing
with 62 additions and 50 deletions
......@@ -16,22 +16,22 @@ endfunction()
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
if(NOT CMake_INSTALL_NAME_TOOL_BUG)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos-unresolved)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos-conflict)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-macos-notfile)
run_install_test(macos)
run_install_test(macos-unresolved)
run_install_test(macos-conflict)
run_install_test(macos-notfile)
endif()
run_cmake(file-GET_RUNTIME_DEPENDENCIES-project)
run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs1)
run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs2)
run_cmake(project)
run_cmake(badargs1)
run_cmake(badargs2)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
run_install_test(file-GET_RUNTIME_DEPENDENCIES-windows)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-windows-unresolved)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-windows-conflict)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-windows-notfile)
run_cmake(file-GET_RUNTIME_DEPENDENCIES-project)
run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs1)
run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs2)
run_install_test(windows)
run_install_test(windows-unresolved)
run_install_test(windows-conflict)
run_install_test(windows-notfile)
run_cmake(project)
run_cmake(badargs1)
run_cmake(badargs2)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
if(DEFINED ENV{LDFLAGS})
# Some setups prebake disable-new-dtags into LDFLAGS
......@@ -40,16 +40,16 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
endif()
if(NOT CMAKE_C_COMPILER_ID MATCHES "^XL")
run_install_test(file-GET_RUNTIME_DEPENDENCIES-linux)
run_install_test(linux)
endif()
run_install_test(file-GET_RUNTIME_DEPENDENCIES-linux-unresolved)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-linux-conflict)
run_install_test(file-GET_RUNTIME_DEPENDENCIES-linux-notfile)
run_cmake(file-GET_RUNTIME_DEPENDENCIES-project)
run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs1)
run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs2)
run_install_test(linux-unresolved)
run_install_test(linux-conflict)
run_install_test(linux-notfile)
run_cmake(project)
run_cmake(badargs1)
run_cmake(badargs2)
else()
run_cmake(file-GET_RUNTIME_DEPENDENCIES-unsupported)
run_cmake(unsupported)
endif()
run_install_test(file-GET_RUNTIME_DEPENDENCIES-variable-propagation)
run_install_test(variable-propagation)
^CMake Warning \(dev\) at file-GET_RUNTIME_DEPENDENCIES-badargs1\.cmake:[0-9]+ \(file\):
^CMake Warning \(dev\) at badargs1\.cmake:[0-9]+ \(file\):
You have used file\(GET_RUNTIME_DEPENDENCIES\) in project mode\. This is
probably not what you intended to do\. Instead, please consider using it in
an install\(CODE\) or install\(SCRIPT\) command\. For example:
......@@ -12,7 +12,7 @@ Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)
This warning is for project developers\. Use -Wno-dev to suppress it\.
CMake Error at file-GET_RUNTIME_DEPENDENCIES-badargs1\.cmake:[0-9]+ \(file\):
CMake Error at badargs1\.cmake:[0-9]+ \(file\):
file Unrecognized argument: "invalid"
Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)$
^CMake Warning \(dev\) at file-GET_RUNTIME_DEPENDENCIES-badargs2\.cmake:[0-9]+ \(file\):
^CMake Warning \(dev\) at badargs2\.cmake:[0-9]+ \(file\):
You have used file\(GET_RUNTIME_DEPENDENCIES\) in project mode\. This is
probably not what you intended to do\. Instead, please consider using it in
an install\(CODE\) or install\(SCRIPT\) command\. For example:
......@@ -12,7 +12,7 @@ Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)
This warning is for project developers\. Use -Wno-dev to suppress it\.
CMake Error at file-GET_RUNTIME_DEPENDENCIES-badargs2\.cmake:[0-9]+ \(file\):
CMake Error at badargs2\.cmake:[0-9]+ \(file\):
file Keywords missing values:
RESOLVED_DEPENDENCIES_VAR
......
......@@ -17,13 +17,13 @@ in file:
endfunction()
set(_check
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/libtest_rpath\.so]]
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/libtest_runpath\.so]]
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath/librpath\.so]]
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_parent/librpath_parent\.so]]
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search/librpath_search\.so]]
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath/librunpath\.so]]
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search/librunpath_search\.so]]
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/libtest_rpath\.so]]
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/libtest_runpath\.so]]
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath/librpath\.so]]
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_parent/librpath_parent\.so]]
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search/librpath_search\.so]]
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath/librunpath\.so]]
[[[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search/librunpath_search\.so]]
)
check_contents(deps/deps1.txt "^${_check}$")
check_contents(deps/deps2.txt "^${_check}$")
......@@ -37,7 +37,7 @@ check_contents(deps/udeps1.txt "^${_check}$")
check_contents(deps/udeps2.txt "^${_check}$")
check_contents(deps/udeps3.txt "^${_check}$")
set(_check
"^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/conflict2/libconflict\\.so\n$"
"^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict2/libconflict\\.so\n$"
)
check_contents(deps/cdeps1.txt "${_check}")
check_contents(deps/cdeps2.txt "${_check}")
......
......@@ -2,7 +2,7 @@
Dependency librpath_search_postexcluded\.so found in search directory:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search_postexcluded
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search_postexcluded
See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\.
Call Stack \(most recent call first\):
......@@ -12,7 +12,7 @@ Call Stack \(most recent call first\):
Dependency librpath_search\.so found in search directory:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search
See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\.
Call Stack \(most recent call first\):
......@@ -22,7 +22,7 @@ Call Stack \(most recent call first\):
Dependency librunpath_search_postexcluded\.so found in search directory:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search_postexcluded
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search_postexcluded
See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\.
Call Stack \(most recent call first\):
......@@ -32,7 +32,7 @@ Call Stack \(most recent call first\):
Dependency librunpath_search\.so found in search directory:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search
See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\.
Call Stack \(most recent call first\):
......@@ -42,7 +42,7 @@ Call Stack \(most recent call first\):
Dependency librpath_search_postexcluded\.so found in search directory:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search_postexcluded
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search_postexcluded
See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\.
Call Stack \(most recent call first\):
......@@ -52,7 +52,7 @@ Call Stack \(most recent call first\):
Dependency librpath_search\.so found in search directory:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search
See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\.
Call Stack \(most recent call first\):
......@@ -62,7 +62,7 @@ Call Stack \(most recent call first\):
Dependency librunpath_search_postexcluded\.so found in search directory:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search_postexcluded
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search_postexcluded
See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\.
Call Stack \(most recent call first\):
......@@ -72,7 +72,7 @@ Call Stack \(most recent call first\):
Dependency librunpath_search\.so found in search directory:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search
See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\.
Call Stack \(most recent call first\):
......@@ -82,7 +82,7 @@ Call Stack \(most recent call first\):
Dependency librpath_search_postexcluded\.so found in search directory:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search_postexcluded
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search_postexcluded
See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\.
Call Stack \(most recent call first\):
......@@ -92,7 +92,7 @@ Call Stack \(most recent call first\):
Dependency librpath_search\.so found in search directory:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/rpath_search
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/rpath_search
See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\.
Call Stack \(most recent call first\):
......@@ -102,7 +102,7 @@ Call Stack \(most recent call first\):
Dependency librunpath_search_postexcluded\.so found in search directory:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search_postexcluded
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search_postexcluded
See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\.
Call Stack \(most recent call first\):
......@@ -112,7 +112,7 @@ Call Stack \(most recent call first\):
Dependency librunpath_search\.so found in search directory:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-build/root-all/lib/runpath_search
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/runpath_search
See file\(GET_RUNTIME_DEPENDENCIES\) documentation for more information\.
Call Stack \(most recent call first\):
......
......@@ -2,6 +2,6 @@
file Multiple conflicting paths found for librpath\.so:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict-build/root-all/lib/rpath1/librpath\.so
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict-build/root-all/lib/rpath1/librpath\.so
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-conflict-build/root-all/lib/rpath2/librpath\.so$
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-conflict-build/root-all/lib/rpath2/librpath\.so$
......@@ -2,4 +2,4 @@
file Failed to run objdump on:
[^
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/file-GET_RUNTIME_DEPENDENCIES-linux-notfile-build/root-all/bin/\.\./lib/libtest\.so$
]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-notfile-build/root-all/bin/\.\./lib/libtest\.so$
......@@ -98,9 +98,9 @@ target_link_options(test_runpath PRIVATE -Wl,--enable-new-dtags)
set_property(TARGET test_rpath ${test_rpath_names} test_runpath ${test_runpath_names} PROPERTY LIBRARY_OUTPUT_DIRECTORY lib)
install(TARGETS test_rpath test_runpath DESTINATION lib)
add_executable(topexe file-GET_RUNTIME_DEPENDENCIES-linux/topexe.c)
add_library(toplib SHARED file-GET_RUNTIME_DEPENDENCIES-linux/toplib.c)
add_library(topmod MODULE file-GET_RUNTIME_DEPENDENCIES-linux/toplib.c)
add_executable(topexe linux/topexe.c)
add_library(toplib SHARED linux/toplib.c)
add_library(topmod MODULE linux/toplib.c)
target_link_libraries(topexe PRIVATE test_rpath test_runpath)
target_link_libraries(toplib PRIVATE test_rpath test_runpath)
target_link_libraries(topmod PRIVATE test_rpath test_runpath)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment