Changeset c0c8962

Timestamp:

May 28, 2021, 2:12:17 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, 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:

• tools/jenkins/setup.sh.in (modified) (3 diffs)

tools/jenkins/setup.sh.in

@@ -30 +30 @@
 {
         local elfout=$(readelf -d $1 | grep "RUNPATH")
-        regex="\[/([[:alpha:]/@_-\.[:digit:]]+)\]"
+        regex='\[/([[:alpha:][:digit:]@/_.-]+)\]'
         if [[ $elfout =~ $regex ]]; then
                 local myRPath=${BASH_REMATCH[1]}
@@ -46 +46 @@
         retlcldeps=()
         while IFS= read -r line; do
-                regex1="/([[:alpha:]/@_-\.[:digit:]]+)"
-                regex2="(libcfa[[:alpha:]\.[:digit:]]+) => not found"
-                regex3="linux-vdso.so.1"
+                regex1='/([[:alpha:][:digit:]@/_.-]+)'
+                regex2='(libcfa[[:alpha:][:digit:].]+) => not found'
+                regex3='linux-vdso.so.1'
                 if [[ $line =~ $regex1 ]]; then
                         retsysdeps+=(${BASH_REMATCH[1]})
@@ -123 +123 @@
 do
         # find the test's name
-        regex="tests/crashes/[[[:alpha:]/-]+/([[:alpha:]/\@_\-\.[:digit:]]+)/exe"
+        regex='tests/crashes/[[[:alpha:]/-]+/([[:alpha:][:digit:]@/_.-]+)/exe'
         if [[ $pgm =~ $regex ]]; then
                 name=${BASH_REMATCH[1]}