Attachment #91210 for bug #56898

View | Details | Raw Unified | Return to bug 56898
Collapse All | Expand All

Lines 24-30 Link Here

(-)glibc-2.3.6.orig/grp/tst_fgetgrent.sh (-1 / +2 lines)
24	rtld_installed_name=$1; shift	24	rtld_installed_name=$1; shift
25		25
26	testout=${common_objpfx}/grp/tst_fgetgrent.out	26	testout=${common_objpfx}/grp/tst_fgetgrent.out
27	library_path=${common_objpfx}	27	# make sure libdl is also in path in case sandbox is in use
		28	library_path=${common_objpfx}:${common_objpfx}/dlfcn
28		29
29	result=0	30	result=0
30		31

Lines 34-40 Link Here

(-)glibc-2.3.6.orig/iconvdata/run-iconv-test.sh (-1 / +1 lines)
34	export GCONV_PATH	34	export GCONV_PATH
35		35
36	# We have to have some directories in the library path.	36	# We have to have some directories in the library path.
37	LIBPATH=$codir:$codir/iconvdata	37	LIBPATH=$codir:$codir/iconvdata:$codir/dlfcn
38		38
39	# How the start the iconv(1) program.	39	# How the start the iconv(1) program.
40	ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \	40	ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \

Lines 59-66 Link Here

(-)glibc-2.3.6.orig/iconvdata/tst-table.sh (-1 / +4 lines)
59	irreversible=${charset}.irreversible	59	irreversible=${charset}.irreversible
60	fi	60	fi
61		61
		62	# make sure libdl is also in path in case sandbox is in use
		63	library_path=${common_objpfx}:${common_objpfx}/dlfcn
		64
62	# iconv in one direction.	65	# iconv in one direction.
63	${common_objpfx}elf/ld.so --library-path $common_objpfx \	66	${common_objpfx}elf/ld.so --library-path $library_path \
64	${objpfx}tst-table-from ${charset} \	67	${objpfx}tst-table-from ${charset} \
65	> ${objpfx}tst-${charset}.table	68	> ${objpfx}tst-${charset}.table
66		69

Lines 38-43 Link Here

(-)glibc-2.3.6.orig/intl/tst-codeset.sh (+3 lines)
38	LOCPATH=${common_objpfx}localedata	38	LOCPATH=${common_objpfx}localedata
39	export LOCPATH	39	export LOCPATH
40		40
		41	# make sure libdl is also in path in case sandbox is in use
		42	library_path=${common_objpfx}:${common_objpfx}/dlfcn
		43
41	${common_objpfx}elf/ld.so --library-path $common_objpfx \	44	${common_objpfx}elf/ld.so --library-path $common_objpfx \
42	${objpfx}tst-codeset > ${objpfx}tst-codeset.out	45	${objpfx}tst-codeset > ${objpfx}tst-codeset.out
43		46

Lines 51-59 Link Here

(-)glibc-2.3.6.orig/intl/tst-gettext.sh (-1 / +4 lines)
51	LOCPATH=${common_objpfx}localedata	51	LOCPATH=${common_objpfx}localedata
52	export LOCPATH	52	export LOCPATH
53		53
		54	# make sure libdl is also in path in case sandbox is in use
		55	library_path=${common_objpfx}:${common_objpfx}/dlfcn
		56
54	# Now run the test.	57	# Now run the test.
55	MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \	58	MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
56	${common_objpfx}elf/ld.so --library-path $common_objpfx \	59	${common_objpfx}elf/ld.so --library-path $library_path \
57	${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir	60	${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
58		61
59	exit $?	62	exit $?

Lines 65-72 Link Here

(-)glibc-2.3.6.orig/intl/tst-gettext2.sh (-1 / +4 lines)
65	LOCPATH=${objpfx}domaindir	65	LOCPATH=${objpfx}domaindir
66	export LOCPATH	66	export LOCPATH
67		67
		68	# make sure libdl is also in path in case sandbox is in use
		69	library_path=${common_objpfx}:${common_objpfx}/dlfcn
		70
68	# Now run the test.	71	# Now run the test.
69	${common_objpfx}elf/ld.so --library-path $common_objpfx \	72	${common_objpfx}elf/ld.so --library-path $library_path \
70	${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&	73	${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
71	cmp ${objpfx}tst-gettext2.out - <<EOF	74	cmp ${objpfx}tst-gettext2.out - <<EOF
72	String1 - Lang1: 1st string	75	String1 - Lang1: 1st string

Lines 33-39 Link Here

(-)glibc-2.3.6.orig/intl/tst-translit.sh (-1 / +4 lines)
33	LOCPATH=${common_objpfx}localedata	33	LOCPATH=${common_objpfx}localedata
34	export LOCPATH	34	export LOCPATH
35		35
36	${common_objpfx}elf/ld.so --library-path $common_objpfx \	36	# make sure libdl is also in path in case sandbox is in use
		37	library_path=${common_objpfx}:${common_objpfx}/dlfcn
		38
		39	${common_objpfx}elf/ld.so --library-path $library_path \
37	${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir	40	${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
38		41
39	exit $?	42	exit $?

Lines 24-28 Link Here

(-)glibc-2.3.6.orig/linuxthreads/tst-signal.sh (-1 / +1 lines)
24	# set up to ignore SIGHUP	24	# set up to ignore SIGHUP
25	trap '' 1	25	trap '' 1
26		26
27	exec ${common_objpfx}elf/ld.so --library-path $common_objpfx:${common_objpfx}linuxthreads \	27	exec ${common_objpfx}elf/ld.so --library-path $common_objpfx:${common_objpfx}linuxthreads:${common_objpfx}/dlfcn \
28	${common_objpfx}linuxthreads/tst-signal	28	${common_objpfx}linuxthreads/tst-signal

Lines 5-12 Link Here

(-)glibc-2.3.6.orig/linuxthreads/tst-tls2.sh (-2 / +2 lines)
5	rtld_installed_name=$1; shift	5	rtld_installed_name=$1; shift
6	logfile=$common_objpfx/linuxthreads/tst-tls2.out	6	logfile=$common_objpfx/linuxthreads/tst-tls2.out
7		7
8	# We have to find libc and linuxthreads	8	# We have to find libc and linuxthreads (also libdl for sandbox)
9	library_path=${common_objpfx}:${common_objpfx}linuxthreads	9	library_path=${common_objpfx}:${common_objpfx}linuxthreads:${common_objpfx}/dlfcn
10	tst_tls1="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \	10	tst_tls1="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
11	${common_objpfx}/linuxthreads/tst-tls1"	11	${common_objpfx}/linuxthreads/tst-tls1"
12		12

Lines 24-32 Link Here

(-)glibc-2.3.6.orig/malloc/tst-mtrace.sh (-1 / +4 lines)
24	status=0	24	status=0
25	trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15	25	trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
26		26
		27	# make sure libdl is also in path in case sandbox is in use
		28	library_path=${common_objpfx}:${common_objpfx}/dlfcn
		29
27	MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \	30	MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \
28	LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \	31	LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
29	${common_objpfx}elf/ld.so --library-path $common_objpfx \	32	${common_objpfx}elf/ld.so --library-path $library_path \
30	${common_objpfx}malloc/tst-mtrace \|\| status=1	33	${common_objpfx}malloc/tst-mtrace \|\| status=1
31		34
32	if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then	35	if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then

Lines 5-12 Link Here

(-)glibc-2.3.6.orig/nptl/tst-tls6.sh (-2 / +2 lines)
5	rtld_installed_name=$1; shift	5	rtld_installed_name=$1; shift
6	logfile=$common_objpfx/nptl/tst-tls6.out	6	logfile=$common_objpfx/nptl/tst-tls6.out
7		7
8	# We have to find libc and nptl	8	# We have to find libc and nptl (also libdl in case sandbox is in use)
9	library_path=${common_objpfx}:${common_objpfx}nptl	9	library_path=${common_objpfx}:${common_objpfx}nptl:${common_objpfx}/dlfcn
10	tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \	10	tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
11	${common_objpfx}/nptl/tst-tls5"	11	${common_objpfx}/nptl/tst-tls5"
12		12

Lines 18-24 Link Here

(-)glibc-2.3.6.orig/posix/globtest.sh (-1 / +1 lines)
18	esac	18	esac
19		19
20	# We have to find the libc and the NSS modules.	20	# We have to find the libc and the NSS modules.
21	library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod	21	library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod:${common_objpfx}/dlfcn
22		22
23	# Since we use `sort' we must make sure to use the same locale everywhere.	23	# Since we use `sort' we must make sure to use the same locale everywhere.
24	LC_ALL=C	24	LC_ALL=C

Lines 10-16 Link Here

(-)glibc-2.3.6.orig/posix/tst-getconf.sh (-1 / +4 lines)
10	else	10	else
11	rtld_installed_name=$1; shift	11	rtld_installed_name=$1; shift
12	runit() {	12	runit() {
13	${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} "$@"	13
		14	# make sure libdl is also in path in case sandbox is in use
		15	library_path=${common_objpfx}:${common_objpfx}/dlfcn
		16	${elf_objpfx}${rtld_installed_name} --library-path ${library_path} "$@"
14	}	17	}
15	fi	18	fi
16		19

Lines 19-26 Link Here

(-)glibc-2.3.6.orig/posix/wordexp-tst.sh (-1 / +4 lines)
19	"	19	"
20	export IFS	20	export IFS
21		21
		22	# make sure libdl is also in path in case sandbox is in use
		23	library_path=${common_objpfx}:${common_objpfx}/dlfcn
		24
22	failed=0	25	failed=0
23	${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \	26	${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
24	${common_objpfx}posix/wordexp-test '$*' > ${testout}1	27	${common_objpfx}posix/wordexp-test '$*' > ${testout}1
25	cat <<"EOF" \| cmp - ${testout}1 >> $logfile \|\| failed=1	28	cat <<"EOF" \| cmp - ${testout}1 >> $logfile \|\| failed=1
26	wordexp returned 0	29	wordexp returned 0

Return to bug 56898