From: Bart Van Assche Date: Sat, 22 Mar 2008 08:08:58 +0000 (+0000) Subject: Modified the run_openmp_test script such that it can be run by Ubuntu's dash shell. X-Git-Tag: svn/VALGRIND_3_4_0~827 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1dc048493271c1e8b9d8c1b1a5b2fd527b244fc9;p=thirdparty%2Fvalgrind.git Modified the run_openmp_test script such that it can be run by Ubuntu's dash shell. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7746 --- diff --git a/exp-drd/tests/run_openmp_test b/exp-drd/tests/run_openmp_test index e329e6c5bd..82b9954a16 100755 --- a/exp-drd/tests/run_openmp_test +++ b/exp-drd/tests/run_openmp_test @@ -4,25 +4,6 @@ # with status 0 if the OpenMP test program should be run and that exits with # status 1 if the OpenMP test program should not be run. -# Inspect the output of nm. If nm does not find any symbol information, -# echo 1. If the symbol gomp_barrier_init is found, echo 0. Otherwise echo -# nothing. The second case occurs if gcc has been compiled with -# --disable-linux-futex, and the last case occurs if gcc has been compiled with -# --enable-linux-futex. -function parse_libgomp { - nm "$1" 2>&1 \ - | - while read line - do - if [ "${line%: no symbols}" != "${line}" ]; then - echo 1 - elif [ "${line% gomp_barrier_init}" != "${line}" ]; then - echo 0 - fi - done -} - - test -e "$1" || exit $? if [ "$(uname)" = Linux ]; then @@ -32,7 +13,21 @@ if [ "$(uname)" = Linux ]; then | while read soname arrow path offset; \ do if [ "${soname#libgomp.so}" != "${soname}" ]; then echo $path; fi; done)" - rc="$(parse_libgomp "${libgomp_path}")" + # Inspect the output of nm. If nm does not find any symbol information, + # echo 1. If the symbol gomp_barrier_init is found, echo 0. Otherwise echo + # nothing. The second case occurs if gcc has been compiled with + # --disable-linux-futex, and the last case occurs if gcc has been compiled + # with --enable-linux-futex. + rc="$(nm "${libgomp_path}" 2>&1 + | + while read line + do + if [ "${line%: no symbols}" != "${line}" ]; then + echo 1 + elif [ "${line% gomp_barrier_init}" != "${line}" ]; then + echo 0 + fi + done)" exit ${rc:-1} fi