From b40a4e1a7bf7000018a8d1d1ee2f37f5c63e5a42 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Fri, 15 May 2015 16:50:09 -0300 Subject: [PATCH] Fix stdlib/tst-setcontext3 with dash [BZ#18418] This patch remove the non-portable array usage on tst-setcontext3.sh script. --- ChangeLog | 5 +++++ NEWS | 2 +- stdlib/tst-setcontext3.sh | 6 ++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89a8df53cc..4a2878a25a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-05-17 Adhemerval Zanella + + [BZ #18418] + * stdlib/tst-setcontext3.sh: Remove non-portable array use. + 2015-05-15 Joseph Myers [BZ #16352] diff --git a/NEWS b/NEWS index 77f6f5a1fb..bfeb3a78f6 100644 --- a/NEWS +++ b/NEWS @@ -18,7 +18,7 @@ Version 2.22 18039, 18042, 18043, 18046, 18047, 18068, 18080, 18093, 18100, 18104, 18110, 18111, 18125, 18128, 18138, 18185, 18196, 18197, 18206, 18210, 18211, 18217, 18220, 18221, 18247, 18287, 18319, 18333, 18346, 18397, - 18409. + 18409, 18418. * Cache information can be queried via sysconf() function on s390 e.g. with _SC_LEVEL1_ICACHE_SIZE as argument. diff --git a/stdlib/tst-setcontext3.sh b/stdlib/tst-setcontext3.sh index 6ad67a8aeb..7bdca91587 100644 --- a/stdlib/tst-setcontext3.sh +++ b/stdlib/tst-setcontext3.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /bin/sh # Bug 18125: Test the exit functionality of setcontext(). # Copyright (C) 2015 Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -29,14 +29,12 @@ test_pre="${test_program_prefix_before_env} ${run_program_env}" test="${test_program_prefix_after_env} ${objpfx}tst-setcontext3" out=${objpfx}tst-setcontext3.out -tempfiles=() cleanup() { - rm -f "${tempfiles[@]}" + rm -f $tempfile } trap cleanup 0 tempfile=$(mktemp "tst-setcontext3.XXXXXXXXXX") -tempfiles+=("$tempfile") # We want to run the test program and see if secontext called # exit() and wrote out the test file we specified. If the