Changeset 28175


Ignore:
Timestamp:
03/22/24 19:39:25 (12 months ago)
Author:
jdquinn
Message:

CHG: Modified test suites; svn bug fixes

Location:
issm/trunk-jpl/packagers
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-matlab.sh

    r27111 r28175  
    3434## Constants
    3535#
     36MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
     37MATLAB_PATH="/usr/local/MATLAB/R2023b"
     38
    3639PKG="ISSM-Linux-MATLAB" # Name of directory to copy distributable files to
    3740
    … …  
    4144#
    4245export COMPRESSED_PKG
     46export MATLAB_NROPTIONS
     47export MATLAB_PATH
    4348export PKG
    4449

  • issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-python-3.sh

    r27111 r28175  
    3535#
    3636PKG="ISSM-Linux-Python-3" # Name of directory to copy distributable files to
     37PYTHON_NROPTIONS="--benchmark all --exclude 125 126 129 234 235 418 420 435 444 445 456 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2012 2013 2020 2021 2051 2052 2053 2084 2085 2090 2091 2092 2101 2424 2425 3001:3300 3480 3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
    3738
    3839COMPRESSED_PKG="${PKG}.tar.gz"
    … …  
    4243export COMPRESSED_PKG
    4344export PKG
     45export PYTHON_NROPTIONS
    4446
    4547## Parse options

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh

    r28161 r28175  
    3333LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
    3434LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
    35 MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
    36 MATLAB_PATH="/usr/local/MATLAB/R2019b"
    3735
    3836## Environment
    … …  
    10098echo "Moving GMT binaries to bin/"
    10199if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt-config ]; then
    102         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt .
    103         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect .
     100        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . 2> /dev/null
     101        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . 2> /dev/null
    104102else
    105103        echo "GMT not found"

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh

    r28161 r28175  
    3333LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
    3434LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
    35 PYTHON_NROPTIONS="--benchmark all --exclude 125 126 129 234 235 418 420 435 444 445 456 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2012 2013 2020 2021 2051 2052 2053 2084 2085 2090 2091 2092 2101 2424 2425 3001:3300 3480 3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
    3635
    3736## Environment
    … …  
    9392echo "Moving GMT binaries to bin/"
    9493if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt-config ]; then
    95         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt .
    96         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect .
     94        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . 2> /dev/null
     95        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . 2> /dev/null
    9796else
    9897        echo "GMT not found"

  • issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-matlab.sh

    r28174 r28175  
    6464## Constants
    6565#
    66 MATLAB_NROPTIONS="'benchmark','all','exclude',[119,124:126,129,216,234,235,274,418,420,423,430,433,435,441:442,444:445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2005,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2110,2111,2112,2113,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
     66MATLAB_NROPTIONS="'benchmark','all','exclude',[119,124:126,129,216,234:235,274,418,420,423,430,433,435,441:442,444:445,448,456,462:464,470:476,508,517,544,546,701:703,808,1101:1110,1201:1208,1301:1304,1401:1402,1601:1602,2002:2008,2010:2013,2020:2021,2051:2053,2084:2085,2090:2092,2101,2110:2113,2424:2425,3001:3300,3480:3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
    6767MATLAB_PATH="/Applications/MATLAB_R2023b.app"
    6868PKG="ISSM-macOS-Silicon-MATLAB" # Name of directory to copy distributable files to

  • issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-python-3.sh

    r28174 r28175  
    6565#
    6666PKG="ISSM-macOS-Silicon-Python-3" # Name of directory to copy distributable files to
    67 PYTHON_NROPTIONS="--benchmark all --exclude 119 124:126 129 216 234:235 274 418 420 423 430 433 435 441:442 444:445 448 456 462:464 508 517 544 546 701:703 808 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002:2008 2010:2013 2020:2021 2051:2053 2084:2085 2090:2092 2101 2110:2113 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
     67PYTHON_NROPTIONS="--benchmark all --exclude 119 124:126 129 216 234:235 274 418 420 423 430 433 435 441:442 444:445 448 456 462:464 470:476 508 517 544 546 701:703 808 1101:1110 1201:1208 1301:1304 1401:1402 1601:1602 2002:2008 2010:2013 2020:2021 2051:2053 2084:2085 2090:2092 2101 2110:2113 2424:2425 3001:3300 3480:3481 4001:4100" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
    6868REPO_BASE_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/silicon/python/3"
    6969SIGNED_REPO_COPY="./signed"

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh

    r28161 r28175  
    3535#               path.
    3636#
    37 alias svn='/usr/local/bin/svn'
     37alias svn=$(which svn)
    3838
    3939## Override certain other aliases
    … …  
    111111echo "Moving GMT binaries to bin/"
    112112if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt-config ]; then
    113         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt .
    114         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect .
     113        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . 2> /dev/null
     114        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . 2> /dev/null
    115115else
    116116        echo "GMT not found"

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh

    r28161 r28175  
    88#                                               for some reason but build is valid.
    99#
    10 # NOTE:
    11 # - Assumes that the following constants are defined,
     10# NOTE: The following variables *must* be defined in order for this script to
     11# work properly,
    1212#
    1313#               COMPRESSED_PKG
    … …  
    3434#               path.
    3535#
    36 alias svn='/usr/local/bin/svn'
     36alias svn=$(which svn)
    3737
    3838## Override certain other aliases
    3939#
     40alias cp=$(which cp)
    4041alias grep=$(which grep)
    4142
    … …  
    103104echo "Moving GMT binaries to bin/"
    104105if [ -f ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt-config ]; then
    105         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt .
    106         cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect .
     106        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmt . 2> /dev/null
     107        cp ${ISSM_DIR}/externalpackages/gmt/install/bin/gmtselect . 2> /dev/null
    107108else
    108109        echo "GMT not found"

  • issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries.sh

    r28113 r28175  
    5858# Expand aliases within the context of this script
    5959shopt -s expand_aliases
    60 
    61 # NOTE: For some reason, calling svn from within the context of this script
    62 #               gives,
    63 #
    64 #                       svn: command not found
    65 #
    66 #               even though it is installed via Homebrew and available at the following
    67 #               path.
    68 #
    69 alias svn='/usr/local/bin/svn'
    7060
    7161## Override certain other aliases

  • issm/trunk-jpl/packagers/mac/transfer-issm-mac-binaries.sh

    r28108 r28175  
    1919# Expand aliases within the context of this script
    2020shopt -s expand_aliases
    21 
    22 # From https://developer.apple.com/documentation/macos-release-notes/macos-catalina-10_15-release-notes,
    23 #
    24 #       Command line tool support for Subversion — including svn, git-svn, and
    25 #       related commands — is no longer provided by Xcode. (50266910)
    26 #
    27 # which results in,
    28 #
    29 #       svn: error: The subversion command line tools are no longer provided by
    30 #       Xcode.
    31 #
    32 # when calling svn, even when subversion is installed via Homebrew and its path
    33 # is available in PATH.
    34 #
    35 # NOTE: May be able to remove this after updating macOS.
    36 #
    37 #alias svn='/usr/local/bin/svn'
    3821
    3922## Override certain other aliases
Note: See TracChangeset for help on using the changeset viewer.