diff --git a/.travis.yml b/.travis.yml index 1498a75d7..1ca0068b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: global: - CACHE="${HOME}/.local" - MPICH_VER="3.2" - - MPICH_URL_HEAD="http://www.mpich.org/static/downloads/${MPICH_VER}" + - MPICH_URL_HEAD="https://www.mpich.org/static/downloads/${MPICH_VER}" - MPICH_URL_TAIL="mpich-${MPICH_VER}.tar.gz" - MPICH_DIR="${HOME}/.local/usr/mpich" - MPICH_GCC6_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/979804/" diff --git a/CMakeLists.txt b/CMakeLists.txt index a8ce97710..e6a0be358 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -594,8 +594,7 @@ if(opencoarrays_aware_compiler) # No other way to check that image_fail_test_1 passes. if ((NOT $ENV{TRAVIS}) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER})) add_fault_tolerant_mpi_test(image_fail_test_1 4 ${tests_root}/unit/fail_images/image_fail_test_1) - set_property(TEST image_fail_test_1 PROPERTY FAIL_REGULAR_EXPRESSION "Test failed") - set_property(TEST image_fail_test_1 PROPERTY PASS_REGULAR_EXPRESSION "Test passed") + set_property(TEST image_fail_test_1 PROPERTY FAIL_REGULAR_EXPRESSION "Test failed.") add_fault_tolerant_mpi_test(image_fail_and_sync_test_1 4 ${tests_root}/unit/fail_images/image_fail_and_sync_test_1) add_fault_tolerant_mpi_test(image_fail_and_sync_test_2 4 ${tests_root}/unit/fail_images/image_fail_and_sync_test_2) diff --git a/doc/robodoc.css b/doc/robodoc.css deleted file mode 100644 index 19b4807cd..000000000 --- a/doc/robodoc.css +++ /dev/null @@ -1,309 +0,0 @@ -/****h* ROBODoc/ROBODoc Cascading Style Sheet - * FUNCTION - * This is a modified version of the default Robodoc cascading - * style sheet generated with ROBODoc. - * - * This style-sheet defines the following layout - * +----------------------------------------+ - * | logo | - * +----------------------------------------+ - * | extra | - * +----------------------------------------+ - * | | navi- | - * | | gation | - * | content | | - * | | | - * +----------------------------------------+ - * | footer | - * +----------------------------------------+ - * - * The Robodoc default style sheet is based on a style sheet - * that was automatically generated with the Strange Banana style - * sheet generator. See http://www.strangebanana.com/generator.aspx - * - ****** - * $Id: html_generator.c,v 1.94 2008/06/17 11:49:27 gumpu Exp $ - */ - -body -{ - background-color: rgb(255,255,255); - color: rgb(98,84,55); - font-family: Arial, serif; - border-color: rgb(226,199,143); -} - -pre -{ - font-family: monospace; - margin: 15px; - padding: 5px; - white-space: pre; - color: #ffe; -} - -pre.source -{ - background-color: rgb(192,192,192); - border: dashed #aa9 1px; -} - -p -{ - margin:15px; -} - -p.item_name -{ - font-weight: bolder; - margin:5px; - font-size: 120%; -} - -#content -{ - font-size: 100%; - color: rgb(0,128,128); - background-color: rgb(255,255,255); - border-left-width: 0px; - border-right-width: 0px; - border-top-width: 0px; - border-bottom-width: 0px; - border-left-style: none; - border-right-style: none; - border-top-style: none; - border-bottom-style: none; - padding: 40px 31px 14px 17px; - border-color: rgb(0,128,128); - text-align: justify; -} - -#navigation -{ - background-color: rgb(192,192,192); - color: rgb(230,221,202); - font-family: "Times New Roman", serif; - font-style: normal; - border-color: rgb(0,128,128); -} - -a.menuitem -{ - font-size: 120%; - background-color: rgb(0,128,128); - color: rgb(255,255,255); - font-variant: normal; - text-transform: none; - font-weight: normal; - padding: 1px 8px 3px 1px; - margin-left: 5px; - margin-right: 5px; - margin-top: 5px; - margin-bottom: 5px; - border-color: rgb(159,126,57); - text-align: right; -} - -#logo, #logo a -{ - font-size: 130%; - background-color: rgb(0,128,128); - color: rgb(255,255,255); - font-family: Georgia, serif; - font-style: normal; - font-variant: normal; - text-transform: none; - font-weight: bold; - padding: 20px 18px 20px 18px; - border-color: rgb(0,128,128); - text-align: right; -} - -#extra, #extra a -{ - font-size: 128%; - background-color: rgb(255,255,255); - color: rgb(0,128,128); - font-style: normal; - font-variant: normal; - text-transform: none; - font-weight: normal; - border-left-width: 0px; - border-right-width: 0px; - border-top-width: 0px; - border-bottom-width: 0px; - border-left-style: none; - border-right-style: none; - border-top-style: none; - border-bottom-style: none; - padding: 12px 12px 12px 12px; - border-color: rgb(0,128,128); - text-align: center; -} - -#content a -{ - color: rgb(159,126,57); - text-decoration: none; -} - -#content a:hover, #content a:active -{ - color: rgb(255,255,255); - background-color: rgb(159,126,57); -} - -a.indexitem -{ - display: block; -} - -h1, h3, h5, h6 -{ - background-color: rgb(192,192,192); - font-family: Arial, serif; - font-style: normal; - font-variant: normal; - text-transform: none; - font-weight: normal; -} - -h2, h4 -{ - background-color: rgb(255,255,255); - font-family: Arial, serif; - font-style: normal; - font-variant: normal; - text-transform: none; - font-weight: normal; -} - -h1 -{ - font-size: 151%; -} - -h2 -{ - font-size: 142%; -} - -h3 -{ - font-size: 133%; -} - -h4 -{ - font-size: 124%; -} - -h5 -{ - font-size: 115%; -} - -h6 -{ - font-size: 106%; -} - -#navigation a -{ - text-decoration: none; -} - -.menuitem:hover -{ - background-color: rgb(195,165,100); - color: rgb(0,128,128); -} - -#extra a -{ - text-decoration: none; -} - -#logo a -{ - text-decoration: none; -} - -#extra a:hover -{ -} - -/* layout */ -#navigation -{ - width: 22%; - position: relative; - top: 0; - right: 0; - float: right; - text-align: center; - margin-left: 10px; -} - -.menuitem {width: auto;} -#content {width: auto;} -.menuitem {display: block;} - - -div#footer -{ - background-color: rgb(198,178,135); - color: rgb(98,84,55); - clear: left; - width: 100%; - font-size: 71%; -} - -div#footer a -{ - background-color: rgb(198,178,135); - color: rgb(98,84,55); -} - -div#footer p -{ - margin:0; - padding:5px 10px -} - -span.keyword -{ - color: #000; -} - -span.comment -{ - color: #080; -} - -span.quote -{ - color: #F00; -} - -span.squote -{ - color: #F0F; -} - -span.sign -{ - color: #008B8B; -} - -span.line_number -{ - color: #808080; -} - -@media print -{ - #navigation {display: none;} - #content {padding: 0px;} - #content a {text-decoration: underline;} -} diff --git a/doc/robodoc.rc b/doc/robodoc.rc deleted file mode 100644 index 7764dca0d..000000000 --- a/doc/robodoc.rc +++ /dev/null @@ -1,67 +0,0 @@ -# Example robodoc.rc -# -items: - NAME - SYNOPSIS - PROGRAM - FUNCTION - SUBROUTINE - MODULE - INPUTS - OUTPUTS - USAGE - PUBLIC -preformatted items: -ignore files: -options: - --doc html - --one_file_per_header - --src .. - --html - --multidoc - --documenttitle "OpenCoarrays" - --index - --tabsize 8 - --nopre - --sections - --css robodoc.css - --syntaxcolors -headertypes: - p "Programs" robo_programs 1 - m "Modules" robo_modules 2 - d "Derived types" robo_derived_types 3 - t "Type-bound procedures" robo_type_bound_procedures 3 - g "Generic Interfaces" robo_constructor_functions 3 - f "Functions" robo_functions 3 - s "Subroutines" robo_subroutines 3 - l "Libraries" robo_libraries 1 - e "Tests" robo_tests 1 -ignore files: - README - *~ -accept files: - *.f90 - *.F90 - *.c - *.cpp -keywords: - program - use - iso_fortran_env - implicit - none - integer - parameter - real - kind - allocatable - allocate - do - enddo - end - sync - all - if - deallocate - num_images - this_image diff --git a/prerequisites/build-functions/set_or_print_url.sh b/prerequisites/build-functions/set_or_print_url.sh index 24163c131..6b607600c 100644 --- a/prerequisites/build-functions/set_or_print_url.sh +++ b/prerequisites/build-functions/set_or_print_url.sh @@ -23,13 +23,13 @@ set_or_print_url() "gcc;${gcc_url_head-}" "wget;ftp://ftp.gnu.org:/gnu/wget/" "m4;ftp://ftp.gnu.org:/gnu/m4/" - "pkg-config;http://pkgconfig.freedesktop.org/releases/" - "mpich;http://www.mpich.org/static/downloads/${version_to_build-}/" - "flex;http://sourceforge.net/projects/flex/files/" + "pkg-config;https://pkgconfig.freedesktop.org/releases/" + "mpich;https://www.mpich.org/static/downloads/${version_to_build-}/" + "flex;https://sourceforge.net/projects/flex/files/" "make;ftp://ftp.gnu.org/gnu/make/" "bison;ftp://ftp.gnu.org:/gnu/bison/" - "cmake;http://www.cmake.org/files/v${major_minor-}/" - "subversion;http://www.eu.apache.org/dist/subversion/" + "cmake;https://www.cmake.org/files/v${major_minor:-}/" + "subversion;https://www.eu.apache.org/dist/subversion/" ) for package in "${package_url_head[@]}" ; do KEY="${package%%;*}" diff --git a/prerequisites/install-ofp.sh b/prerequisites/install-ofp.sh index adc96cdaf..7ad9223cb 100755 --- a/prerequisites/install-ofp.sh +++ b/prerequisites/install-ofp.sh @@ -61,7 +61,7 @@ export __flag_present=1 # shellcheck disable=SC2154 if [[ "${__os}" != "OSX" ]]; then echo "Source tranlsation via OFP is currently supported only on OS X." - echo "Please submit an issue at http://github.com/sourceryinstitute/opencoarrays/issues." + echo "Please submit an issue at https://github.com/sourceryinstitute/opencoarrays/issues." emergency "${PWD}/install-ofp.sh: Aborting." fi diff --git a/src/tests/unit/fail_images/image_fail_test_1.f90 b/src/tests/unit/fail_images/image_fail_test_1.f90 index 544ea0c8d..afd9ec447 100644 --- a/src/tests/unit/fail_images/image_fail_test_1.f90 +++ b/src/tests/unit/fail_images/image_fail_test_1.f90 @@ -18,4 +18,3 @@ program image_fail_test_1 end associate end program image_fail_test_1 -