[commits] r2947 - in /trunk/libc: ChangeLog.eglibc nptl/tst-tls6.sh

[jimb@xxxxxxxxxx]

Author: jimb
Date: Thu Jul 26 02:13:15 2007
New Revision: 2947

Log:
* nptl/tst-tls6.sh: Remove bashisms.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/nptl/tst-tls6.sh

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Thu Jul 26 02:13:15 2007
@@ -1,3 +1,7 @@
+2007-07-26  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
+
+	* nptl/tst-tls6.sh: Remove bashisms.
+
 2007-07-12  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
 
 	Implement the OPTION_EGLIBC_NSSWITCH option group.

Modified: trunk/libc/nptl/tst-tls6.sh
==============================================================================
--- trunk/libc/nptl/tst-tls6.sh (original)
+++ trunk/libc/nptl/tst-tls6.sh Thu Jul 26 02:13:15 2007
@@ -21,36 +21,44 @@
 > $logfile
 fail=0
 
+preloads () {
+    l=''
+    for s in "$@"; do
+        l="$l ${common_objpfx}nptl/tst-tls5mod$s.so"
+    done
+    echo $l | sed 's/:$//;s/: /:/g'
+}
+
 for aligned in a e f; do
   echo "preload tst-tls5mod{$aligned,b,c,d}.so" >> $logfile
   echo "===============" >> $logfile
-  EGLIBC_TEST_LD_PRELOAD=`echo ${common_objpfx}nptl/tst-tls5mod{$aligned,b,c,d}.so \
-	      | sed 's/:$//;s/: /:/g'` ${tst_tls5} >> $logfile || fail=1
+  EGLIBC_TEST_LD_PRELOAD=`preloads $aligned b c d` \
+	      ${tst_tls5} >> $logfile || fail=1
   echo >> $logfile
 
   echo "preload tst-tls5mod{b,$aligned,c,d}.so" >> $logfile
   echo "===============" >> $logfile
-  EGLIBC_TEST_LD_PRELOAD=`echo ${common_objpfx}nptl/tst-tls5mod{b,$aligned,c,d}.so \
-	      | sed 's/:$//;s/: /:/g'` ${tst_tls5} >> $logfile || fail=1
+  EGLIBC_TEST_LD_PRELOAD=`preloads b $aligned c d` \
+	      ${tst_tls5} >> $logfile || fail=1
   echo >> $logfile
 
   echo "preload tst-tls5mod{b,c,d,$aligned}.so" >> $logfile
   echo "===============" >> $logfile
-  EGLIBC_TEST_LD_PRELOAD=`echo ${common_objpfx}nptl/tst-tls5mod{b,c,d,$aligned}.so \
-	      | sed 's/:$//;s/: /:/g'` ${tst_tls5} >> $logfile || fail=1
+  EGLIBC_TEST_LD_PRELOAD=`preloads b c d $aligned` \
+	      ${tst_tls5} >> $logfile || fail=1
   echo >> $logfile
 done
 
 echo "preload tst-tls5mod{d,a,b,c,e}" >> $logfile
 echo "===============" >> $logfile
-EGLIBC_TEST_LD_PRELOAD=`echo ${common_objpfx}nptl/tst-tls5mod{d,a,b,c,e}.so \
-	    | sed 's/:$//;s/: /:/g'` ${tst_tls5} >> $logfile || fail=1
+EGLIBC_TEST_LD_PRELOAD=`preloads d a b c e` \
+	    ${tst_tls5} >> $logfile || fail=1
 echo >> $logfile
 
 echo "preload tst-tls5mod{d,a,b,e,f}" >> $logfile
 echo "===============" >> $logfile
-EGLIBC_TEST_LD_PRELOAD=`echo ${common_objpfx}nptl/tst-tls5mod{d,a,b,e,f}.so \
-	    | sed 's/:$//;s/: /:/g'` ${tst_tls5} >> $logfile || fail=1
+EGLIBC_TEST_LD_PRELOAD=`preloads d a b e f` \
+	    ${tst_tls5} >> $logfile || fail=1
 echo >> $logfile
 
 exit $fail