aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-10-25 21:59:14 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-10-25 21:59:14 +0000
commit6a345e4261f34abd45b15c41469a942237a48537 (patch)
treef99f07f0f348fe82cd3152c6b5d9a9343dc19441
parent1e9d84cdbc46301a0d9e83f7044393f7d8139382 (diff)
downloadglibc-6a345e4261f34abd45b15c41469a942237a48537.zip
glibc-6a345e4261f34abd45b15c41469a942237a48537.tar.gz
glibc-6a345e4261f34abd45b15c41469a942237a48537.tar.bz2
Use bash to run nptl/tst-tls6.sh.
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/Makefile2
-rwxr-xr-xnptl/tst-tls6.sh2
3 files changed, 8 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 62771e3..553c778 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-25 Joseph Myers <joseph@codesourcery.com>
+
+ * Makefile ($(objpfx)tst-tls6.out): Use $(BASH) not $(SHELL) to
+ run tst-tls6.sh.
+ * tst-tls6.sh: Use /bin/bash not /bin/sh.
+
2012-10-25 Roland McGrath <roland@hack.frob.com>
* tst-basic2.c (do_test): Return RESULT, not always zero.
diff --git a/nptl/Makefile b/nptl/Makefile
index f84646e..c7bb61b 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -475,7 +475,7 @@ $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \
$(objpfx)tst-tls5moda.so $(objpfx)tst-tls5modb.so \
$(objpfx)tst-tls5modc.so $(objpfx)tst-tls5modd.so \
$(objpfx)tst-tls5mode.so $(objpfx)tst-tls5modf.so
- $(SHELL) $< $(common-objpfx) $(elf-objpfx) \
+ $(BASH) $< $(common-objpfx) $(elf-objpfx) \
$(rtld-installed-name) '$(test-wrapper-env)'
endif
diff --git a/nptl/tst-tls6.sh b/nptl/tst-tls6.sh
index 6ef1232..27450c3 100755
--- a/nptl/tst-tls6.sh
+++ b/nptl/tst-tls6.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
# A tls test.
# Copyright (C) 2003-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.