Merge pull request #377 from sourceryinstitute/more-robust-script-test

More robust script test & dev tests

Author: zbeekman

CMakeLists.txt

@@ -14,6 +14,10 @@ else()
 endif()
 mark_as_advanced(RUN_DEVELOPER_TESTS)
 
+if( NOT DEFINED ENV{OPENCOARRAYS_DEVELOPER})
+  set ( ENV{OPENCOARRAYS_DEVELOPER} FALSE )
+endif()
+
 # Name project and specify source languages
 # Parse version from .VERSION file so that more info can be added and easier to get from scripts
 file( STRINGS ".VERSION" OpenCoarraysVersion
@@ -476,7 +480,7 @@ if(opencoarrays_aware_compiler)
     add_mpi_test(register_alloc_comp_1 2 ${tests_root}/unit/init_register/register_alloc_comp_1)
     add_mpi_test(register_alloc_comp_2 2 ${tests_root}/unit/init_register/register_alloc_comp_2)
     add_mpi_test(register_alloc_comp_3 2 ${tests_root}/unit/init_register/register_alloc_comp_3)
-    if (RUN_DEVELOPER_TESTS)
+    if (RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER})
       message ( STATUS "Running Developer tests is enabled." )
       add_mpi_test(async_comp_alloc 6 ${tests_root}/unit/init_register/async_comp_alloc)
       # Timeout async_comp_alloc test after 3 seconds to progess past the known failure
@@ -519,7 +523,7 @@ if(opencoarrays_aware_compiler)
     # GFortran PR 78505 only fixed on trunk/gcc 7
     add_mpi_test(source-alloc-no-sync 8 ${tests_root}/regression/reported/source-alloc-sync)
   endif()
-  if (RUN_DEVELOPER_TESTS)
+  if (RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER})
     add_mpi_test(convert-before-put 3 ${tests_root}/regression/reported/convert-before-put)
   endif()
   add_mpi_test(event-post 3 ${tests_root}/regression/reported/event-post)

cmake/AddInstallationScriptTest.cmake

@@ -1,15 +1,12 @@
 macro(add_installation_script_test name path)
 
   # Copy the source to the binary tree
-  configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/${path}/${name}
-    ${CMAKE_CURRENT_BINARY_DIR}/${path}/${name}
-    COPYONLY
+  file( COPY "${CMAKE_CURRENT_SOURCE_DIR}/${path}/${name}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${path}"
+    FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+    DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
   )
-  configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/${path}/${name}-usage
-    ${CMAKE_CURRENT_BINARY_DIR}/${path}/${name}-usage
-    COPYONLY
+  file( COPY "${CMAKE_CURRENT_SOURCE_DIR}/${path}/${name}-usage" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${path}"
+    FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
   )
   add_test(NAME test-${name} COMMAND "${CMAKE_BINARY_DIR}/${path}/${name}")
   set_property(TEST test-${name} PROPERTY WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/${path}")

src/mpi/CMakeLists.txt

@@ -76,7 +76,7 @@ set(exe_dir ${CMAKE_BINARY_DIR}/bin_staging)
 set(compiler_wrapper ${exe_dir}/caf)
 install(
     FILES "${compiler_wrapper}"
-    PERMISSIONS WORLD_EXECUTE WORLD_READ OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ
+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     DESTINATION "${CMAKE_INSTALL_BINDIR}"
 )
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/caf-head CAF_HEADER)
@@ -109,7 +109,7 @@ file(APPEND "${compiler_wrapper}" "${FOOTER}")
 set(caf_launcher ${exe_dir}/cafrun)
 install(
     FILES "${caf_launcher}"
-    PERMISSIONS WORLD_EXECUTE WORLD_READ OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ
+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     DESTINATION "${CMAKE_INSTALL_BINDIR}"
 )
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/cafrun-head CAFRUN_HEADER)

src/tests/unit/extensions/CMakeLists.txt

@@ -31,7 +31,7 @@ function(generate_test_script base_name num_images)
   endif()
   file(APPEND "${harness}" "${CMAKE_INSTALL_PREFIX}/bin/cafrun -np ${num_images} ./${executable}\n")
   file( INSTALL "${harness}"
-    PERMISSIONS WORLD_EXECUTE WORLD_READ OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ
+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
   )