Skip to content

Commit 4d651f4

Browse files
committed
Fix permissions and make script test more robust
- Permissions for scripts should be u=rwx,g=rx,o=rx (755) - Shell script test had permissions issues in the past, and `configure_file( ... )` was being used, where `file( COPY ...` should have been used instead.
1 parent 82ccc59 commit 4d651f4

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

cmake/AddInstallationScriptTest.cmake

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
macro(add_installation_script_test name path)
22

33
# Copy the source to the binary tree
4-
configure_file(
5-
${CMAKE_CURRENT_SOURCE_DIR}/${path}/${name}
6-
${CMAKE_CURRENT_BINARY_DIR}/${path}/${name}
7-
COPYONLY
4+
file( COPY "${CMAKE_CURRENT_SOURCE_DIR}/${path}/${name}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${path}"
5+
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
6+
DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
87
)
9-
configure_file(
10-
${CMAKE_CURRENT_SOURCE_DIR}/${path}/${name}-usage
11-
${CMAKE_CURRENT_BINARY_DIR}/${path}/${name}-usage
12-
COPYONLY
8+
file( COPY "${CMAKE_CURRENT_SOURCE_DIR}/${path}/${name}-usage" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${path}"
9+
FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
1310
)
1411
add_test(NAME test-${name} COMMAND "${CMAKE_BINARY_DIR}/${path}/${name}")
1512
set_property(TEST test-${name} PROPERTY WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/${path}")

src/mpi/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ set(exe_dir ${CMAKE_BINARY_DIR}/bin_staging)
7676
set(compiler_wrapper ${exe_dir}/caf)
7777
install(
7878
FILES "${compiler_wrapper}"
79-
PERMISSIONS WORLD_EXECUTE WORLD_READ OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ
79+
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
8080
DESTINATION "${CMAKE_INSTALL_BINDIR}"
8181
)
8282
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/caf-head CAF_HEADER)
@@ -109,7 +109,7 @@ file(APPEND "${compiler_wrapper}" "${FOOTER}")
109109
set(caf_launcher ${exe_dir}/cafrun)
110110
install(
111111
FILES "${caf_launcher}"
112-
PERMISSIONS WORLD_EXECUTE WORLD_READ OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ
112+
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
113113
DESTINATION "${CMAKE_INSTALL_BINDIR}"
114114
)
115115
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/cafrun-head CAFRUN_HEADER)

src/tests/unit/extensions/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function(generate_test_script base_name num_images)
3131
endif()
3232
file(APPEND "${harness}" "${CMAKE_INSTALL_PREFIX}/bin/cafrun -np ${num_images} ./${executable}\n")
3333
file( INSTALL "${harness}"
34-
PERMISSIONS WORLD_EXECUTE WORLD_READ OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ
34+
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
3535
DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
3636
)
3737

0 commit comments

Comments
 (0)