Ignore:
Timestamp:
May 28, 2021, 2:12:17 PM (18 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
e72969a
Parents:
cece53c
Message:

Tentative fix to make setup.sh more robust
(tokens inside [] in Bash regex don't appear commutative)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/jenkins/setup.sh.in

    rcece53c rc0c8962  
    3030{
    3131        local elfout=$(readelf -d $1 | grep "RUNPATH")
    32         regex="\[/([[:alpha:]/@_-\.[:digit:]]+)\]"
     32        regex='\[/([[:alpha:][:digit:]@/_.-]+)\]'
    3333        if [[ $elfout =~ $regex ]]; then
    3434                local myRPath=${BASH_REMATCH[1]}
     
    4646        retlcldeps=()
    4747        while IFS= read -r line; do
    48                 regex1="/([[:alpha:]/@_-\.[:digit:]]+)"
    49                 regex2="(libcfa[[:alpha:]\.[:digit:]]+) => not found"
    50                 regex3="linux-vdso.so.1"
     48                regex1='/([[:alpha:][:digit:]@/_.-]+)'
     49                regex2='(libcfa[[:alpha:][:digit:].]+) => not found'
     50                regex3='linux-vdso.so.1'
    5151                if [[ $line =~ $regex1 ]]; then
    5252                        retsysdeps+=(${BASH_REMATCH[1]})
     
    123123do
    124124        # find the test's name
    125         regex="tests/crashes/[[[:alpha:]/-]+/([[:alpha:]/\@_\-\.[:digit:]]+)/exe"
     125        regex='tests/crashes/[[[:alpha:]/-]+/([[:alpha:][:digit:]@/_.-]+)/exe'
    126126        if [[ $pgm =~ $regex ]]; then
    127127                name=${BASH_REMATCH[1]}
Note: See TracChangeset for help on using the changeset viewer.