diff options
author | Mark Wielaard <mark@klomp.org> | 2017-03-03 23:51:13 +0100 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2017-03-06 15:17:20 +0200 |
commit | f0a581925ad4c948dc58cc8f9a55399ad8de351e (patch) | |
tree | 6d1adf1960c86323cdce92b0cae5874ba60a26a2 | |
parent | b0a268e5fb744a1d2c3854e95366d5eb4382a842 (diff) | |
download | rpm-f0a581925ad4c948dc58cc8f9a55399ad8de351e.tar.gz |
tests/tpmbuild.at: Make file sed regexp more strict to extract BuildID.
In some testcases we extract the BuildID with the file command.
Unfortunately the file command output changed slightly between versions.
Make the sed regexp more strict by only matching a hex-string.
Also properly "escape" [ and ] which inside an AT_CHECK should be [[ and ]].
Tested against file versions 5.11, 5.29 and 5.30.
Signed-off-by: Mark Wielaard <mark@klomp.org>
-rw-r--r-- | tests/rpmbuild.at | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/rpmbuild.at b/tests/rpmbuild.at index a46822f52..dcbdd2cad 100644 --- a/tests/rpmbuild.at +++ b/tests/rpmbuild.at @@ -423,11 +423,11 @@ hello2_file=./usr/local/bin/hello2 test -f $hello_file || echo "no hello file: $hello_file" test -f $hello2_file || echo "no hello2 file: $hello2_file" -id1=$(file $hello_file | sed 's/.*, BuildID[.*]=\(.*\),.*/\1/') -id2=$(file $hello2_file | sed 's/.*, BuildID[.*]=\(.*\),.*/\1/') -id1debug=$(file $hello_file_debug | sed 's/.*, BuildID[.*]=\(.*\),.*/\1/') -id2debug=$(file $hello2_file_debug | sed 's/.*, BuildID[.*]=\(.*\),.*/\1/') -idmulti=$(file $hello_multi_file | sed 's/.*, BuildID[.*]=\(.*\),.*/\1/') +id1=$(file $hello_file | sed 's/.*, BuildID\[[.*\]]=\([[0-9a-f]]*\),.*/\1/') +id2=$(file $hello2_file | sed 's/.*, BuildID\[[.*\]]=\([[0-9a-f]]*\),.*/\1/') +id1debug=$(file $hello_file_debug | sed 's/.*, BuildID\[[.*\]]=\([[0-9a-f]]*\),.*/\1/') +id2debug=$(file $hello2_file_debug | sed 's/.*, BuildID\[[.*\]]=\([[0-9a-f]]*\),.*/\1/') +idmulti=$(file $hello_multi_file | sed 's/.*, BuildID\[[.*\]]=\([[0-9a-f]]*\),.*/\1/') test "$id1" = "$id1debug" || echo "id1: $id1 != id1debug: $id1debug" test "$id2" = "$id2debug" || echo "id2: $id2 != id2debug: $id2debug" @@ -516,11 +516,11 @@ hello2_file=./usr/local/bin/hello2 test -f $hello_file || echo "no hello file: $hello_file" test -f $hello2_file || echo "no hello2 file: $hello2_file" -id1=$(file $hello_file | sed 's/.*, BuildID[.*]=\(.*\),.*/\1/') -id2=$(file $hello2_file | sed 's/.*, BuildID[.*]=\(.*\),.*/\1/') -id1debug=$(file $hello_file_debug | sed 's/.*, BuildID[.*]=\(.*\),.*/\1/') -id2debug=$(file $hello2_file_debug | sed 's/.*, BuildID[.*]=\(.*\),.*/\1/') -idmulti=$(file $hello_multi_file | sed 's/.*, BuildID[.*]=\(.*\),.*/\1/') +id1=$(file $hello_file | sed 's/.*, BuildID\[[.*\]]=\([[0-9a-f]]*\),.*/\1/') +id2=$(file $hello2_file | sed 's/.*, BuildID\[[.*\]]=\([[0-9a-f]]*\),.*/\1/') +id1debug=$(file $hello_file_debug | sed 's/.*, BuildID\[[.*\]]=\([[0-9a-f]]*\),.*/\1/') +id2debug=$(file $hello2_file_debug | sed 's/.*, BuildID\[[.*\]]=\([[0-9a-f]]*\),.*/\1/') +idmulti=$(file $hello_multi_file | sed 's/.*, BuildID\[[.*\]]=\([[0-9a-f]]*\),.*/\1/') test "$id1" = "$id1debug" || echo "id1: $id1 != id1debug: $id1debug" test "$id2" = "$id2debug" || echo "id2: $id2 != id2debug: $id2debug" |